From fc0ea7bb4f979ddd1a1481d8428636008e87144d Mon Sep 17 00:00:00 2001 From: maho Date: Sat, 19 Apr 2003 01:47:29 +0000 Subject: 1. Correct include path for instsetoo/util/openoffice.lst Without it, licensing terms are not copied and installation fails for some localizd build. (affects patch-instsetoo+util+openoffice.lst and Makefile) 2. Added CJK Word 95/6.0/RTF import feature (Other patches) 3. Bump port revision By Takashi Ono --- editors/openoffice-1.1-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice-1.1/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice-2.0-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice-3-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice-3/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-1.1-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-1.1/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-2-RC/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-2-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-2.0-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-2.0/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-2/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-3-RC/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-3-devel/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-3/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ editors/openoffice.org-vcltesttool/Makefile | 2 +- .../files/patch-instsetoo+util+openoffice.lst | 10 ++ .../files/patch-svx+source+svrtf+rtfitem.cxx | 24 +++ .../files/patch-svx+source+svrtf+svxrtf.cxx | 19 +++ .../files/patch-sw+source+filter+rtf+swparrtf.cxx | 161 +++++++++++++++++++++ .../files/patch-sw+source+filter+rtf+swparrtf.hxx | 10 ++ .../files/patch-sw+source+filter+ww8+ww8par.cxx | 38 +++++ .../files/patch-sw+source+filter+ww8+ww8par6.cxx | 25 ++++ 136 files changed, 4896 insertions(+), 17 deletions(-) create mode 100644 editors/openoffice-1.1-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice-1.1/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice-1.1/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice-1.1/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice-3-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice-3/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice-3/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice-3/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-1.1/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-1.1/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-1.1/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-2.0/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-2/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-2/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-2/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-3/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-3/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-3/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par6.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-instsetoo+util+openoffice.lst create mode 100644 editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+rtfitem.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+svxrtf.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.hxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par6.cxx (limited to 'editors') diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice-1.1-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice-1.1-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice-1.1/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice-1.1/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice-1.1/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice-1.1/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice-1.1/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice-1.1/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice-1.1/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice-2.0-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice-2.0-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice-3-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice-3-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice-3/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice-3/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice-3/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice-3/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice-3/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice-3/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice-3/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice-3/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice-3/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice-3/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice-3/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-1.1/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-1.1/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-1.1/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-1.1/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-1.1/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-1.1/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-2-RC/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-2-RC/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-2-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-2-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-2.0-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-2.0-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-2.0/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-2.0/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-2.0/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-2.0/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-2.0/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-2.0/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-2/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-2/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-2/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-2/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-2/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-2/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-2/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-3-RC/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-3-RC/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-3-devel/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-3-devel/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-3/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-3/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-3/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-3/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-3/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-3/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-3/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 79351770f737..3437495ba615 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 644 +PORTREVISION= 1 SNAPDATE= 20030412 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -523,7 +524,6 @@ pre-install: -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp @${MKDIR} -p ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ - @${CP} ${WRKSRC}/../solver/644/unxfbsd.pro/bin/01/osl/* ${WRKSRC}/../solver/644/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) diff --git a/editors/openoffice.org-vcltesttool/files/patch-instsetoo+util+openoffice.lst b/editors/openoffice.org-vcltesttool/files/patch-instsetoo+util+openoffice.lst new file mode 100644 index 000000000000..633d22570428 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-instsetoo+util+openoffice.lst @@ -0,0 +1,10 @@ +--- ../instsetoo/util/openoffice.lst.orig Sat Feb 1 00:38:02 2003 ++++ ../instsetoo/util/openoffice.lst Thu Apr 17 22:55:06 2003 +@@ -9,6 +9,6 @@ + active 1 + compression 5 + script setup_osl +- include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/bin.{minor}/01/,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. ++ include .,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor}/$(LANG),{solarpath}/bin.{minor}/$(LANG)/osl,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor},{solarcommonpath}/bin.{minor}/$(LANG),{solarcommonpath}/bin.{minor}/$(LANG)/osl,{solarcommonpath}/bin.{minor}/$(LANG)/fat,{solarpath}/bin.{minor}/01/,{solarpath}/bin.{minor}/01/osl/,{solarcommonpath}/bin.{minor}/01/,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},{solarcommonpath}/xml.{minor}/office/instance,{solarcommonpath}/xml,../../external/common,. + } + } diff --git a/editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+rtfitem.cxx b/editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+rtfitem.cxx new file mode 100644 index 000000000000..5ebcaf8e27b1 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+rtfitem.cxx @@ -0,0 +1,24 @@ +--- ../svx/source/svrtf/rtfitem.cxx.orig Thu Apr 17 22:50:50 2003 ++++ ../svx/source/svrtf/rtfitem.cxx Thu Apr 17 23:40:15 2003 +@@ -285,11 +285,20 @@ + } + else + { +- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) ++// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK ++ if( LOW_CHARTYPE == eType ) + { + if( *pNormal ) + { + rItem.SetWhich( *pNormal ); ++ rSet.Put( rItem ); ++ } ++ } ++ else if( HIGH_CHARTYPE == eType ) ++ { ++ if( *pCTL ) ++ { ++ rItem.SetWhich( *pCTL ); + rSet.Put( rItem ); + } + } diff --git a/editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+svxrtf.cxx b/editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+svxrtf.cxx new file mode 100644 index 000000000000..6d07a8f4d6ff --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-svx+source+svrtf+svxrtf.cxx @@ -0,0 +1,19 @@ +--- ../svx/source/svrtf/svxrtf.cxx.orig 2003-01-17 22:27:36.000000000 +0900 ++++ ../svx/source/svrtf/svxrtf.cxx 2003-04-06 00:37:52.000000000 +0900 +@@ -583,8 +583,14 @@ + + case RTF_FCHARSET: + if( -1 != nTokenValue ) +- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( +- (BYTE)nTokenValue ) ); ++ { ++// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset( ++// (BYTE)nTokenValue ) ); ++ CharSet nCharSet = ++ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue ); ++ pFont->SetCharSet( nCharSet ); ++ SetEncoding( nCharSet ); //Takashi Ono ++ } + break; + + case RTF_FPRQ: diff --git a/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.cxx b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.cxx new file mode 100644 index 000000000000..03f0d8bd8b59 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.cxx @@ -0,0 +1,161 @@ +--- ../sw/source/filter/rtf/swparrtf.cxx.orig Thu Apr 17 22:51:18 2003 ++++ ../sw/source/filter/rtf/swparrtf.cxx Thu Apr 17 22:59:27 2003 +@@ -3120,10 +3120,156 @@ + SetSwgValues( rCollSet ); + } + ++//Takashi Ono for CJK ++String SwRTFParser::XlateFmtColName( const String &rName ) ++{ ++#define RES_NONE RES_POOLCOLL_DOC_END ++ ++ static const RES_POOL_COLLFMT_TYPE aArr[]={ ++ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2, ++ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5, ++ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8, ++ RES_POOLCOLL_HEADLINE9, ++ ++ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_TOX_CNTNT1, ++ ++ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4, ++ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7, ++ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, ++ RES_NONE, RES_POOLCOLL_FOOTNOTE, ++ ++ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, ++ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, ++ RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE, ++ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, ++ ++ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE, ++ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE, ++ ++ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL }; ++ static const sal_Char *stiName[] = { ++ "Normal", ++ "heading 1", ++ "heading 2", ++ "heading 3", ++ "heading 4", ++ "heading 5", ++ "heading 6", ++ "heading 7", ++ "heading 8", ++ "heading 9", ++ "index 1", ++ "index 2", ++ "index 3", ++ "index 4", ++ "index 5", ++ "index 6", ++ "index 7", ++ "index 8", ++ "index 9", ++ "toc 1", ++ "toc 2", ++ "toc 3", ++ "toc 4", ++ "toc 5", ++ "toc 6", ++ "toc 7", ++ "toc 8", ++ "toc 9", ++ "Normal Indent", ++ "footnote text", ++ "annotation text", ++ "header", ++ "footer", ++ "index heading", ++ "caption", ++ "table of figures", ++ "envelope address", ++ "envelope return", ++ "footnote reference", ++ "annotation reference", ++ "line number", ++ "page number", ++ "endnote reference", ++ "endnote text", ++ "table of authorities", ++ "macro", ++ "toa heading", ++ "List", ++ "List Bullet", ++ "List Number", ++ "List 2", ++ "List 3", ++ "List 4", ++ "List 5", ++ "List Bullet 2", ++ "List Bullet 3", ++ "List Bullet 4", ++ "List Bullet 5", ++ "List Number 2", ++ "List Number 3", ++ "List Number 4", ++ "List Number 5", ++ "Title", ++ "Closing", ++ "Signature", ++ "Default Paragraph Font", ++ "Body Text", ++ "Body Text Indent", ++ "List Continue", ++ "List Continue 2", ++ "List Continue 3", ++ "List Continue 4", ++ "List Continue 5", ++ "Message Header", ++ "Subtitle", ++ }; ++ ++ ++ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ), ++ "Style-UEbersetzungstabelle hat falsche Groesse" ); ++ ++ RES_POOL_COLLFMT_TYPE nId = RES_NONE; ++ ++ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++) ++ { ++ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) ) ++ { ++ nId = aArr[i]; ++ break; ++ } ++ } ++ USHORT nResId; ++ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END ) ++ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN; ++ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ++ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN; ++ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ++ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN; ++ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END) ++ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN; ++ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END) ++ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN; ++ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END) ++ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN; ++ return String( ResId( nResId + nId, pSwResMgr ) ); ++} ++ + SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ) + { +- int bCollExist; +- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), ++ int bCollExist; ++// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK ++ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ), ++ USHORT(nNo), + rStyle.nOutlineNo, bCollExist ); + aTxtCollTbl.Insert( nNo, pColl ); + diff --git a/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.hxx b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.hxx new file mode 100644 index 000000000000..2a690d3de0d2 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+rtf+swparrtf.hxx @@ -0,0 +1,10 @@ +--- ../sw/source/filter/rtf/swparrtf.hxx.orig Fri Feb 7 01:29:41 2003 ++++ ../sw/source/filter/rtf/swparrtf.hxx Thu Apr 17 22:57:18 2003 +@@ -360,6 +360,7 @@ + void SetStyleAttr( SfxItemSet& rCollSet, + const SfxItemSet& rStyleSet, + const SfxItemSet& rDerivedSet ); ++ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK + SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle ); + void MakeStyleTab(); diff --git a/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par.cxx b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par.cxx new file mode 100644 index 000000000000..793e8488f12c --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par.cxx @@ -0,0 +1,38 @@ +--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900 +@@ -1558,11 +1558,20 @@ + if (bVer67) + { + sal_Char aTest[2]; +- aTest[0] = (nUCode & 0xFF00) >> 8; +- aTest[1] = (nUCode & 0x00FF); +- String aTemp(aTest, 2, eSrcCharSet); +- ASSERT(aTemp.Len() == 1, "so much for that theory"); +- *pWork = aTemp.GetChar(0); ++ if (nUCode >= 0x3000) ++ { ++ aTest[0] = (nUCode & 0xFF00) >> 8; ++ aTest[1] = (nUCode & 0x00FF); ++ String aTemp(aTest, 2, eSrcCharSet); ++ ASSERT(aTemp.Len() == 1, "so much for that theory"); ++ *pWork = aTemp.GetChar(0); ++ } ++ else ++ { ++ aTest[0] = (nUCode & 0x00FF); ++ String aTemp(aTest, 1, eSrcCharSet); ++ *pWork = aTemp.GetChar(0); ++ } + } + else + *pWork = nUCode; +@@ -3099,7 +3108,8 @@ + { + case 6: + case 7: +- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) ++ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono ++ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) ) + { + //JP 06.05.99: teste auf eigenen 97-Fake! + if (pStg && 0xa5ec == nMagic) diff --git a/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par6.cxx b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par6.cxx new file mode 100644 index 000000000000..1ff350ab77e5 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-sw+source+filter+ww8+ww8par6.cxx @@ -0,0 +1,25 @@ +--- ../sw/source/filter/ww8/ww8par6.cxx.orig 2003-02-07 01:36:16.000000000 +0900 ++++ ../sw/source/filter/ww8/ww8par6.cxx 2003-04-06 08:56:40.000000000 +0900 +@@ -3352,9 +3352,11 @@ + nId = RES_CHRATR_CTL_FONT; + break; + case 93: ++ case 111: + case 0x4a4f: + nId = RES_CHRATR_FONT; + break; ++ case 112: + case 0x4a50: + nId = RES_CHRATR_CJK_FONT; + break; +@@ -4830,8 +4832,8 @@ + //percentage to grow hps short + {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri + //ysri short +- {111, (FNReadRecord)0}, //"??111", +- {112, (FNReadRecord)0}, //"??112", ++ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font ++ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font + {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font + {114, (FNReadRecord)0}, //"??114", + {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ? -- cgit