diff options
| author | nobody <nobody@gnome.org> | 2005-11-08 12:38:40 +0000 |
|---|---|---|
| committer | nobody <nobody@gnome.org> | 2005-11-08 12:38:40 +0000 |
| commit | 1808f887391a0af898f8df852ba129f5718f7e9b (patch) | |
| tree | 947a60485129732ae3a22fbdfebadbe2875509e4 | |
| parent | 7d00f30779d128d6bb8ae95a768c62d89ba1cd1e (diff) | |
This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_3_17
'OOO_BUILD_1_3_17'.
32 files changed, 4680 insertions, 294 deletions
diff --git a/bin/package-lang b/bin/package-lang index d628ec77d..36e66df8c 100755 --- a/bin/package-lang +++ b/bin/package-lang @@ -221,8 +221,8 @@ sub BuildLang { $action = "Link"; } else { - chmod 0644,"$outpath/$value->{Name}"; - copy($fileToCopy,$outpath) or die "Can't copy $fileToCopy to $outpath"; + chmod 0644,"$destFile"; + copy($fileToCopy,$destFile) or die "Can't copy $fileToCopy to $destFile"; $action = "Copy"; } } diff --git a/bin/unpack b/bin/unpack index 5a6d12dea..e09d6e9ff 100755 --- a/bin/unpack +++ b/bin/unpack @@ -102,6 +102,14 @@ tar $OOO_UNTAR_OPTIONS $SRCDIR/$OOO_TARBALL || exit 1 cp -af $TOOLSDIR/bin/oowintool $OOBUILDDIR/config_office chmod a+x $OOBUILDDIR/config_office/oowintool +# hack: fix possible packaging problem in 1.1.3 +chmod a+x $OOBUILDDIR/icu/convert.sh + +# Fix error in archive +if test "z$VERSION" = 'z1.1.4'; then + rm -f $OOBUILDDIR/berkeleydb/download/db-3.2.9.tar.gz; +fi + # Win32 prerequisites ... if test "z$BUILD_WIN32" != "z"; then diff --git a/configure.in b/configure.in index 043a1c0ad..d09aa93a3 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREFIX_DEFAULT(/usr) OOO_BUILDMAJOR_VERSION=1 OOO_BUILDMINOR_VERSION=3 -OOO_BUILDMICRO_VERSION=5 +OOO_BUILDMICRO_VERSION=17 dnl this includes pre-pended period. OOO_BUILDSTRIKE_VERSION= OOO_BUILDVERSION="$OOO_BUILDMAJOR_VERSION.$OOO_BUILDMINOR_VERSION.$OOO_BUILDMICRO_VERSION$OOO_BUILDSTRIKE_VERSION" @@ -75,6 +75,11 @@ AC_ARG_WITH(jdk-home, Java is disabled, this option has no effect. ],,) +AC_ARG_WITH(ant-home, +[ + --with-ant-home: specify the path of your ant installation. +],,) + AC_ARG_WITH(installed-ooo-dirname, [ --with-installed-ooo-dirname: specify the directory name of the core OOo network @@ -83,6 +88,15 @@ AC_ARG_WITH(installed-ooo-dirname, Example: --with-installed-ooo-dirname=ooo-1.1 ],,) +AC_ARG_WITH(binsuffix, +[ + --with-binsuffix + specify the suffix to be used on the end of script + names, to allow parallel installation of two versions. + + Default: --with-binsuffix=], +,) + AC_ARG_WITH(docdir, [ --with-docdir: define the directory name where the extra documentation @@ -157,15 +171,14 @@ AC_ARG_ENABLE(gcc33, Usage: --force-gcc33 ],,) -AC_ARG_WITH(arch, +AC_ARG_WITH(system-db-version, [ - --with-arch: Define the architecture that we will target. + --with-system-db-version: Specify the version of berkeleydb on the system that you wish to use. - Usage: --with-arch=[x86|ppc|sparc] + Usage: --with-system-db-version=4.2 ],,) - AM_MAINTAINER_MODE dnl @@ -198,19 +211,26 @@ else fi PKG_CHECK_MODULES( FOO_COMMON, - [ gtk+-2.0 libxml-2.0 fontconfig >= 1.0.1 \ - libstartup-notification-1.0 ], + [ libxml-2.0 fontconfig >= 1.0.1 ], have_common=true, have_common=false ) +PKG_CHECK_MODULES( FOO_COMMON_OPTIONAL, + [ gtk+-2.0 libstartup-notification-1.0 ], + have_common_optional=true, have_common_optional=false ) + # NB. according to: # http://sources.redhat.com/ml/bug-automake/2002/msg02066.html # it's a really bad idea to do conditional tests for things. # if test "z$with_win32" = "z"; then - if test ! $have_common; then + if test "$have_common" != "true"; then AC_MSG_ERROR([Library requirements were not met]) fi + if test "$have_common_optional" != "true"; then + AC_MSG_WARN([libstartup-notification and/or gtk+ are missing, some configs depend on them]) + fi + if test "z$enable_bonobo" = "zyes"; then ENABLE_BONOBO="yes" else @@ -232,8 +252,8 @@ fi PKG_CHECK_MODULES( FOO_GNOME, [ gnome-vfs-2.0 ], have_gnome=true, have_gnome=false ) -if test ! $have_gnome; then - AC_MSG_ERROR([Gnome library requirements were not met]) +if test "$have_gnome" != "true"; then + AC_MSG_WARN([Gnome library requirements were not met, building without gnome support]) fi AC_SUBST(ENABLE_BONOBO) @@ -249,10 +269,6 @@ if test "z$with_tag" = "z"; then fi APPLY_DIR="$TOOLSDIR/patches/$with_tag" -# Exceptions for some tags... -if test "z$with_tag" = "zOOO_1_1_3_fix2" ; then - APPLY_DIR="$TOOLSDIR/patches/OOO_1_1_3" -fi if test -f $APPLY_DIR/apply; then AC_MSG_RESULT( found $with_tag, using $APPLY_DIR/apply ) @@ -315,14 +331,13 @@ PKG_CHECK_MODULES( BAA, libart-2.0 >= $LIBART_VERSION, have_baa=true, have_baa=false ) if test "z$with_win32" = "z"; then - if test ! $have_baa; then + if test "$have_baa" != "true"; then AC_MSG_ERROR([You need to install libart development headers]) fi else AC_PATH_PROG(CABEXTRACT, cabextract) if test "!" -x "$CABEXTRACT" ; then - AC_MSG_ERROR([ -*** The cabextract utility must be installed.]) + AC_MSG_ERROR([*** The cabextract utility must be installed.]) fi fi @@ -332,12 +347,6 @@ fi DISTRO=$with_distro AC_SUBST(DISTRO) -PKG_CHECK_MODULES( BAZ, evolution-data-server-1.0 >= 0.0.92, - have_baz=true, have_baz=false ) -if test "z$with_distro" = "NLD" -a ! $have_baz; then - AC_MSG_ERROR([You need to install evolution-data-server]) -fi - VENDORNAME=OpenOffice if test "z$with_vendor" != "z"; then VENDORNAME="$with_vendor" @@ -365,11 +374,15 @@ if test "z$with_distro" = "zArk"; then fi JDK_HOME= +ANT_HOME= if test "z$enable_java" = "zyes"; then ENABLE_JAVA=yes if test "z$with_jdk_home" != "z"; then JDK_HOME=$with_jdk_home fi + if test "z$with_ant_home" != "z"; then + ANT_HOME=$with_ant_home + fi else AC_PATH_PROG(XSLTPROC, xsltproc, no) if test "$XSLTPROC" = "no"; then @@ -379,24 +392,31 @@ else fi AC_SUBST(ENABLE_JAVA) AC_SUBST(JDK_HOME) +AC_SUBST(ANT_HOME) AC_CHECK_HEADER(security/pam_appl.h, have_pam=true, have_pam=false) +AC_CHECK_HEADER(cups/cups.h, have_cups=true, have_cups=false) AC_CHECK_HEADER(png.h, have_png=true, have_png=false) AC_CHECK_HEADER(zlib.h, have_zlib=true, have_zlib=false) +AC_CHECK_PROG(IMG_MAGIC, convert, yes) if test "z$with_win32" = "z"; then - if test ! $have_pam; then + if test "$have_pam" != "true"; then AC_MSG_ERROR(install pam-devel) fi - if test ! $have_png; then + + if test "$have_cups" != "true"; then + AC_MSG_ERROR(install cups-devel) + fi + + if test "$have_png" != "true"; then AC_MSG_ERROR(install png-devel) fi - if test ! $have_zlib; then + if test "$have_zlib" != "true"; then AC_MSG_ERROR(install zlib-devel) fi - AC_CHECK_PROG(IMG_MAGIC, convert, yes) if ! test "z$IMG_MAGIC" = "zyes"; then AC_MSG_ERROR( ImageMagick must be installed ) fi @@ -466,7 +486,7 @@ for icons_name in $with_icons ; do ooo_icons_ver="ooo-debug_icons-OOO_1_1-0.1" ;; Bluecurve) - ooo_icons_ver="ooo-icons-bluecurve-OOO_1_1-10" + ooo_icons_ver="ooo-icons-bluecurve-OOO_1_1-11" ;; Ximian | Gnome | gnome | GNOME ) ooo_icons_ver="ooo-icons-OOO_1_1-10" @@ -517,16 +537,12 @@ if test "z$enable_gcc33" != "z"; then fi AC_SUBST(FORCE_GCC33) -ARCHITECTURE="unxlngi4" -if test "z$with_arch" != "z"; then - if test "z$with_arch" = "zppc"; then - ARCHITECTURE="unxlngppc" - fi - if test "z$with_arch" = "zsparc"; then - ARCHITECTURE="unxlngs" - fi +# Specify a system berkeleydb version +SYSTEM_DB_VERSION="" +if test "z$with_system_db_version" != "z"; then + SYSTEM_DB_VERSION="$with_system_db_version" fi -AC_SUBST(ARCHITECTURE) +AC_SUBST(SYSTEM_DB_VERSION) AC_MSG_CHECKING([for broken aliases]) if `alias gcc > /dev/null 2>&1`; then @@ -534,7 +550,17 @@ if `alias gcc > /dev/null 2>&1`; then fi AC_MSG_RESULT(ok) -OOO_BINSUFFIX= +AC_MSG_CHECKING([for binsuffix]) + +if test "z$with_binsuffix" = "zno"; then + OOO_BINSUFFIX= +elif test "z$with_binsuffix" != "z"; then + OOO_BINSUFFIX=$with_binsuffix +else + OOO_BINSUFFIX= +fi +AC_MSG_RESULT([$OOO_BINSUFFIX]) +AC_SUBST(OOO_BINSUFFIX) AC_MSG_CHECKING([for ooo-version]) if test "z$(echo "$CVSTAG" | sed -e 's#OOO_\([0-9]_[0-9]\)_.*#\1#')" = "z1_1"; then @@ -545,7 +571,6 @@ fi OOO_VERSION="$OOO_MAJOR.$(echo "$CVSTAG" | sed -e 's#OOO_[0-9]_[0-9]_\([0-9]\).*#\1#')" AC_SUBST(OOO_VERSION) -AC_SUBST(OOO_BINSUFFIX) datestamp=`date '+%Y%m%d.%H%M'`; SNAPSHOT_TAG="$datestamp.$TAG"; @@ -584,16 +609,28 @@ ooo1.1.spec bin/setup bin/Makefile desktop/Makefile +distro-configs/Makefile +distro-configs/NLD.conf +distro-configs/Win32.conf +distro-configs/RH9.conf +distro-configs/FedoraCore1.conf +distro-configs/FedoraCore2.conf +distro-configs/FedoraCore3.conf +distro-configs/FedoraCore4.conf +distro-configs/RHEL3.conf +distro-configs/RHEL4.conf +distro-configs/Ark.conf etc/Makefile fonts/Makefile patches/Makefile patches/wpd/Makefile patches/evo2/Makefile +patches/gcc34/Makefile patches/vclplug/Makefile patches/mscodec/Makefile patches/OOO_1_1/Makefile -patches/OOO_1_1_2/Makefile -patches/OOO_1_1_3/Makefile +patches/OOO_1_1_4/Makefile +patches/OOO_1_1_5/Makefile po/Makefile doc/Makefile src/Makefile diff --git a/desktop/presentation.desktop.in b/desktop/presentation.desktop.in index 4ea2c595f..1b685e45e 100644 --- a/desktop/presentation.desktop.in +++ b/desktop/presentation.desktop.in @@ -9,6 +9,6 @@ Terminal=false Type=Application Categories=GNOME;Application;Office;X-Ximian-Main; StartupNotify=true -MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress; +MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template X-GNOME-Bugzilla-Bugzilla=Ximian X-GNOME-Bugzilla-Product=OpenOffice.org Ximian Edition diff --git a/doc/patches-list.txt b/doc/patches-list.txt new file mode 100644 index 000000000..37556a9f0 --- /dev/null +++ b/doc/patches-list.txt @@ -0,0 +1,46 @@ +**fpicker patches applied in m79** + +!!! fpicker-csv-filter-open-fix.diff +!!! fpicker-accessibility-fix.diff +!!! fpicker-gnome-crash-fix.diff +!!! fpicker-euro-converter-fix.diff +!!! fpicker-gnome-vfs-fix.diff +!!! fpicker-case-insensitive.diff +!! fpicker-fixes.diff + + to be taken partially + +? fpicker-common-build.diff +? fpicker-kde-service.diff +? fpicker-kde-dialog.diff +? fpicker-kde-partial-kio.diff +? fpicker-common-scp2.diff +#fpicker-show-checkbox.diff + + already backported + +**fpicker patches applied in OOO_1_1_4** + +fpicker-desktop-environment.diff +fpicker-svtools-gtk-or-kde.diff +fpicker-gnome-svtools-folderpicker.diff +fpicker-gnome-build.diff +fpicker-gnome-scp.diff +#fpicker-show-checkbox.diff +#fpicker-gnome-entry.diff +#fpicker-gnome-eventnotification.diff +#fpicker-gnome-asynceventnotifier.diff +#fpicker-gnome-picker-hxx.diff +#fpicker-gnome-picker-cxx.diff +#fpicker-gnome-folderpicker-hxx.diff +#fpicker-gnome-folderpicker-cxx.diff +#fpicker-gnome-filepicker-hxx.diff +#fpicker-gnome-filepicker-cxx.diff +fpicker-gnome-resource.diff +fpicker-gnome-serviceinfo.diff +fpicker-gnome-xml.diff +sfx2-fpicker-gnome-filter-fix.diff +fpicker-common.diff +fpicker-kde.diff +native-fpicker-not-default.diff + +**Common patches among 1_1_4 and m79** +fpicker-show-checkbox.diff diff --git a/patches/OOO_1_1/build-new-xslt.diff b/patches/OOO_1_1/build-new-xslt.diff new file mode 100644 index 000000000..972ac902a --- /dev/null +++ b/patches/OOO_1_1/build-new-xslt.diff @@ -0,0 +1,20 @@ +--- officecfg/util/resource.xsl.orig 2005-09-23 14:00:56.000000000 +0200 ++++ officecfg/util/resource.xsl 2005-09-23 14:02:14.000000000 +0200 +@@ -84,7 +84,8 @@ + </xsl:template> + + <!-- match all elements that could possibly contain info elements --> +- <xsl:template match="info/desc[@xml:lang=$locale]|info/label[@xml:lang=$locale]"> ++ <xsl:template match="info/desc|info/label"> ++ <xsl:if test="@xml:lang=$locale"> + + <!-- print TPF's path to current node --> + <xsl:for-each select="ancestor-or-self::*"> +@@ -108,6 +109,7 @@ + + <xsl:apply-templates/> + ++ </xsl:if> + </xsl:template> + + </xsl:transform> diff --git a/patches/OOO_1_1/cws-heapbug_CAN-2005-0941.diff b/patches/OOO_1_1/cws-heapbug_CAN-2005-0941.diff new file mode 100644 index 000000000..4ad65421c --- /dev/null +++ b/patches/OOO_1_1/cws-heapbug_CAN-2005-0941.diff @@ -0,0 +1,17 @@ +Index: source/sdstor/stgole.cxx +=================================================================== +RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v +retrieving revision 1.4 +retrieving revision 1.4.206.1 +diff -u -u -r1.4 -r1.4.206.1 +--- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 ++++ sot/source/sdstor/stgole.cxx 11 Apr 2005 16:22:26 -0000 1.4.206.1 +@@ -156,6 +156,8 @@ + *this >> aClsId; + INT32 nLen1 = 0; + *this >> nLen1; ++ // the higher bits are ignored ++ nLen1 &= 0xFFFF; + sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; + if( Read( p, nLen1 ) == (ULONG) nLen1 ) + { diff --git a/patches/OOO_1_1/default-graphics-cache.diff b/patches/OOO_1_1/default-graphics-cache.diff new file mode 100644 index 000000000..ca45f3fa2 --- /dev/null +++ b/patches/OOO_1_1/default-graphics-cache.diff @@ -0,0 +1,20 @@ +--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2005-03-22 20:05:58.000000000 +0100 ++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2005-03-23 12:20:22.000000000 +0100 +@@ -9098,7 +9098,7 @@ + <label xml:lang="kn-IN">Total Graphic Cache Size</label> + <label xml:lang="gl">Total Graphic Cache Size</label> + </info> +- <value>10240000</value> ++ <value>20480000</value> + </prop> + <prop oor:name="ObjectCacheSize" oor:type="xs:int"> + <info> +@@ -9184,7 +9184,7 @@ + <label xml:lang="kn-IN">Graphic Object Cache Size</label> + <label xml:lang="gl">Graphic Object Cache Size</label> + </info> +- <value>2560000</value> ++ <value>5120000</value> + </prop> + <prop oor:name="ObjectReleaseTime" oor:type="xs:int"> + <info> diff --git a/patches/OOO_1_1/i18n-calc-encoding.diff b/patches/OOO_1_1/i18n-calc-encoding.diff index 15c23ed17..11c0cf3b2 100644 --- a/patches/OOO_1_1/i18n-calc-encoding.diff +++ b/patches/OOO_1_1/i18n-calc-encoding.diff @@ -2,10 +2,11 @@ Index: calc/profile_calc.lng =================================================================== RCS file: /cvs/installation/scp/source/calc/Attic/profile_calc.lng,v retrieving revision 1.49.24.5 -diff -u -r1.49.24.5 profile_calc.lng ---- scp/source/calc/profile_calc.lng 27 Apr 2004 18:15:09 -0000 1.49.24.5 -+++ scp/source/calc/profile_calc.lng 10 Jun 2004 15:28:49 -0000 -@@ -598,7 +598,7 @@ +Index: scp/source/calc/profile_calc.lng +=================================================================== +--- scp/source/calc/profile_calc.lng.orig 2004-09-13 22:31:50.000000000 +0200 ++++ scp/source/calc/profile_calc.lng 2004-09-14 15:49:37.746332016 +0200 +@@ -678,7 +678,7 @@ 82 = "%PRODUCTNAME %PRODUCTVERSION 스프레드시트" 86 = "%PRODUCTNAME %PRODUCTVERSION 工作表" 88 = "%PRODUCTNAME %PRODUCTVERSION 工作表" @@ -14,23 +15,11 @@ diff -u -r1.49.24.5 profile_calc.lng 07 = " %PRODUCTNAME %PRODUCTVERSION" 30 = " %PRODUCTNAME %PRODUCTVERSION" 31 = "%PRODUCTNAME %PRODUCTVERSION Werkblad" -@@ -636,7 +636,7 @@ - 34 = "Hoja de ~clculo" - 55 = "~Planilha" - 48 = "~Arkusz kalkulacyjny" --03 = "Folha de ~cálculo" -+03 = "Folha de ~clculo" - 82 = "스프레드시트(~S)" - 33 = "~Classeur" - 96 = "~Spreadsheet" -Index: impress/profile_impress.lng +Index: scp/source/impress/profile_impress.lng =================================================================== -RCS file: /cvs/installation/scp/source/impress/Attic/profile_impress.lng,v -retrieving revision 1.57.24.5 -diff -u -r1.57.24.5 profile_impress.lng ---- scp/source/impress/profile_impress.lng 27 Apr 2004 18:18:43 -0000 1.57.24.5 -+++ scp/source/impress/profile_impress.lng 10 Jun 2004 15:28:51 -0000 -@@ -639,7 +639,7 @@ +--- scp/source/impress/profile_impress.lng.orig 2004-09-13 22:32:00.000000000 +0200 ++++ scp/source/impress/profile_impress.lng 2004-09-14 15:49:37.749331560 +0200 +@@ -724,7 +724,7 @@ 82 = "%PRODUCTNAME %PRODUCTVERSION 프레젠테이션" 86 = "%PRODUCTNAME %PRODUCTVERSION 演示文稿" 88 = "%PRODUCTNAME %PRODUCTVERSION 簡報" @@ -39,7 +28,7 @@ diff -u -r1.57.24.5 profile_impress.lng 07 = " %PRODUCTNAME %PRODUCTVERSION" 30 = " %PRODUCTNAME %PRODUCTVERSION" 31 = "%PRODUCTNAME %PRODUCTVERSION Presentatie" -@@ -677,7 +677,7 @@ +@@ -767,7 +767,7 @@ 34 = "~Presentacin" 55 = "A~presentao" 48 = "~Prezentacja" @@ -48,7 +37,7 @@ diff -u -r1.57.24.5 profile_impress.lng 82 = "프레젠테이션(~P)" 33 = "~Prsentation" 96 = " ~" -@@ -714,7 +714,7 @@ +@@ -809,7 +809,7 @@ 34 = "~Presentacin..." 55 = "A~presentao..." 48 = "~Prezentacja..." @@ -56,15 +45,12 @@ diff -u -r1.57.24.5 profile_impress.lng +03 = "A~presentao..." 82 = "프레젠테이션(~P)..." 33 = "~Prsentation..." - 96 = "~Presentation..." -Index: math/profile_math.lng + 96 = "~ ..." +Index: scp/source/math/profile_math.lng =================================================================== -RCS file: /cvs/installation/scp/source/math/Attic/profile_math.lng,v -retrieving revision 1.40.24.4 -diff -u -r1.40.24.4 profile_math.lng ---- scp/source/math/profile_math.lng 27 Apr 2004 18:20:23 -0000 1.40.24.4 -+++ scp/source/math/profile_math.lng 10 Jun 2004 15:28:51 -0000 -@@ -80,7 +80,7 @@ +--- scp/source/math/profile_math.lng.orig 2004-09-13 22:32:04.000000000 +0200 ++++ scp/source/math/profile_math.lng 2004-09-14 15:49:37.750331408 +0200 +@@ -90,7 +90,7 @@ 34 = "~Frmula" 55 = "~Frmula" 48 = "F~ormua" @@ -73,14 +59,11 @@ diff -u -r1.40.24.4 profile_math.lng 82 = "수식(~O)" 33 = "F~ormule" 96 = "" -Index: office/profile.lng +Index: scp/source/office/profile.lng =================================================================== -RCS file: /cvs/installation/scp/source/office/Attic/profile.lng,v -retrieving revision 1.58.24.8 -diff -u -r1.58.24.8 profile.lng ---- scp/source/office/profile.lng 4 May 2004 06:48:05 -0000 1.58.24.8 -+++ scp/source/office/profile.lng 10 Jun 2004 15:28:53 -0000 -@@ -1080,7 +1080,7 @@ +--- scp/source/office/profile.lng.orig 2004-09-13 22:32:06.000000000 +0200 ++++ scp/source/office/profile.lng 2004-09-14 15:49:37.756330496 +0200 +@@ -1225,7 +1225,7 @@ 34 = "~Tarjetas de visita" 55 = "Cartes de ~Visita" 48 = "~Wizytwki" @@ -88,8 +71,8 @@ diff -u -r1.58.24.8 profile.lng +03 = "Cartes de ~visita" 82 = "명함(~U)" 33 = "Cartes de ~visite" - 96 = "B~usiness Cards" -@@ -1302,7 +1302,7 @@ + 96 = "~ " +@@ -1477,7 +1477,7 @@ 34 = "Pgina ~Web..." 55 = "Pgina da ~Web..." 48 = "Strona ~WWW..." @@ -97,8 +80,8 @@ diff -u -r1.58.24.8 profile.lng +03 = "Pgina ~Web..." 82 = "웹 페이지(~W)..." 33 = "Page ~Web..." - 96 = "~Web Page..." -@@ -1339,7 +1339,7 @@ + 96 = "~ ..." +@@ -1519,7 +1519,7 @@ 34 = "Formulario..." 55 = "~Formulrio..." 48 = "Fo~rmularz..." @@ -106,8 +89,8 @@ diff -u -r1.58.24.8 profile.lng +03 = "F~ormulrio..." 82 = "양식(~R)..." 33 = "Form~ulaire..." - 96 = "Form..." -@@ -1520,7 +1520,7 @@ + 96 = "~..." +@@ -1725,7 +1725,7 @@ 01 = "Address Data Source..." 44 = "Address Data Source..." 49 = "Adress-Datenquelle..." diff --git a/patches/OOO_1_1/i18n-lang-italian-fontooowizard.diff b/patches/OOO_1_1/i18n-lang-italian-fontooowizard.diff new file mode 100644 index 000000000..b8bc31c61 --- /dev/null +++ b/patches/OOO_1_1/i18n-lang-italian-fontooowizard.diff @@ -0,0 +1,11 @@ +--- scp/source/office/profile.lng.ita 2004-09-25 10:54:15.143495568 +0200 ++++ scp/source/office/profile.lng 2004-09-25 10:55:01.387437949 +0200 +@@ -1858,7 +1858,7 @@ + 46 = "FontOOo Wizard..." + 45 = "Installer skrifttyper fra internettet..." + 49 = "Schriftarten aus dem Internet installieren..." +-39 = "FontOOo Wizard..." ++39 = "Installa font da Internet..." + 35 = "FontOOo Wizard..." + 37 = "Instal·la tipus de lletra des d'Internet..." + 66 = "FontOOo Wizard..." diff --git a/patches/OOO_1_1/i18n-lang-typo-italian.diff b/patches/OOO_1_1/i18n-lang-typo-italian.diff new file mode 100644 index 000000000..da51f5932 --- /dev/null +++ b/patches/OOO_1_1/i18n-lang-typo-italian.diff @@ -0,0 +1,1542 @@ +--- basctl/source/basicide/basidesh.src.lang39 2004-09-09 19:50:02.000000000 +0200 ++++ basctl/source/basicide/basidesh.src 2004-09-13 09:20:14.586837872 +0200 +@@ -557,7 +557,7 @@ + Text[ dutch ] = "De naam van een bibliotheek mag maximaal 30 tekens lang zijn."; + Text[ french ] = "Le nom d'une bibliothque peut contenir au maximum 30 caractres."; + Text[ spanish ] = "El nombre de la biblioteca no debe contener ms de 30 caracteres."; +- Text[ italian ] = "Il nome della librery pu avere una lunghezza massima di 30 caratteri."; ++ Text[ italian ] = "Il nome di una libreria pu avere una lunghezza massima di 30 caratteri."; + Text[ danish ] = "Navnet p et bibliotek m hjst vre p 30 tegn."; + Text[ swedish ] = "Namnet p ett bibliotek fr maximalt innehlla 30 tecken."; + Text[ polish ] = "Nazwa biblioteki moe si skada maksymalnie z 30 znakw."; +--- basic/source/classes/sb.src.lang39 2004-09-09 19:03:50.000000000 +0200 ++++ basic/source/classes/sb.src 2004-09-13 09:20:14.580837752 +0200 +@@ -2345,7 +2345,7 @@ + Text = "Zeitberschreitung whrend des Wartens auf DDE-Antwort" ; + Text [ ENGLISH ] = "Timeout while waiting for DDE response" ; + Text [ norwegian ] = "Tidsgrense ndd ved venting p DDE-svar" ; +- Text [ italian ] = "Tempo d'attesa per la rispota DDE oltrepassato" ; ++ Text [ italian ] = "Tempo d'attesa per la risposta DDE oltrepassato" ; + Text [ portuguese_brazilian ] = "Tempo de espera esgotado durante a espera por uma resposta DDE" ; + Text [ portuguese ] = "Ultrapassado tempo de espera pela resposta DDE" ; + Text [ french ] = "Timeout pendant l'attente de la rponse DDE" ; +@@ -4624,7 +4624,7 @@ + Text = "Wert kann nicht zugewiesen werden" ; + Text [ ENGLISH ] = "Cannot set value" ; + Text [ norwegian ] = "Kan ikke bruke verdi" ; +- Text [ italian ] = "Impossibile attribuitre il valore" ; ++ Text [ italian ] = "Impossibile attribuire il valore" ; + Text [ portuguese_brazilian ] = "No possvel aplicar o valor" ; + Text [ portuguese ] = "Impossvel atribuir o valor" ; + Text [ french ] = "Impossible d'attribuer la valeur" ; +--- dbaccess/source/ui/control/tabletree.src.lang39 2004-09-09 18:23:10.000000000 +0200 ++++ dbaccess/source/ui/control/tabletree.src 2004-09-13 09:20:14.294832048 +0200 +@@ -163,7 +163,7 @@ + Text[ dutch ] = "Aflopend sorteren"; + Text[ french ] = "Tri dcroissant"; + Text[ spanish ] = "Orden descendente"; +- Text[ italian ] = "Disponi in ordine descrescente"; ++ Text[ italian ] = "Disponi in ordine decrescente"; + Text[ danish ] = "Sorter faldende"; + Text[ swedish ] = "Sortera fallande"; + Text[ polish ] = "Sortuj malejco"; +--- dbaccess/source/ui/dlg/RelationDlg.src.lang39 2004-09-09 18:24:09.000000000 +0200 ++++ dbaccess/source/ui/dlg/RelationDlg.src 2004-09-13 09:20:14.295832068 +0200 +@@ -459,7 +459,7 @@ + Text [ portuguese_brazilian ] = "~Sem ao" ; + Text [ swedish ] = "Ing~en tgrd" ; + Text [ danish ] = "~Ingen handling" ; +- Text [ italian ] = "~Nessua operazione" ; ++ Text [ italian ] = "~Nessuna operazione" ; + Text [ spanish ] = "Ninguna a~ccin" ; + Text [ french ] = "A~ucune action" ; + Text [ dutch ] = "G~een handeling" ; +--- dbaccess/source/ui/dlg/dbadmin.src.lang39 2004-09-09 18:24:58.000000000 +0200 ++++ dbaccess/source/ui/dlg/dbadmin.src 2004-09-13 09:20:14.302832207 +0200 +@@ -1622,7 +1622,7 @@ + Text [ dutch ] = "Er bestaat reeds een andere gegevensbron met deze naam. Kies een andere naam."; + Text [ french ] = "Ce nom a dj t attribu une autre source de donnes. tant donn que les sources de donnes doivent avoir des noms globalement uniques, vous devez en choisir un autre."; + Text [ spanish ] = "Ya existe otra fuente de datos con este nombre. Debe elegir otro ya que el nombre de la fuente de datos debe ser globalmente nico."; +- Text [ italian ] = "Esiste gi una sorgente dati con questo nome. Poich il nome delle sorgenti di dati dev'essere univoco, necesario scegliere un altro nome."; ++ Text [ italian ] = "Esiste gi una sorgente dati con questo nome. Poich il nome delle sorgenti di dati dev'essere univoco, necessario scegliere un altro nome."; + Text [ danish ] = "Der findes allerede en anden datakilde med dette navn. Da datakildenavne skal vre unikke, skal du vlge et andet navn."; + Text [ swedish ] = "Det finns redan en dataklla med det hr namnet. Eftersom namn p datakllor mste vara globalt unika br du vlja ett annat namn."; + Text [ polish ] = "Istnieje inne rdo danych o tej samej nazwie. Poniewa nazwy rde danych musz by globalnie jednoznaczne, naley wybra inn nazw."; +@@ -1843,7 +1843,7 @@ + Text[ portuguese ] = "To adjust the settings, go to the MySQL tab page."; + Text[ russian ] = " MySQL."; + Text[ spanish ] = "Vaya a la ficha MySQL para realizar la configuracin."; +- Text[ italian ] = "Per corregere le impostazioni andate alla scheda MySQL."; ++ Text[ italian ] = "Per correggere le impostazioni andate alla scheda MySQL."; + Text[ swedish ] = "G till MySQL-fliken fr att gra instllningarna."; + Text[ polish ] = "To adjust the settings, go to the MySQL tab page."; + Text[ portuguese_brazilian ] = "Para ajustar as configuraes, v para a pgina da guia MySQL."; +@@ -5255,7 +5255,7 @@ + Message[ dutch ] = "De naam van de gewiste gegevensbron heeft u reeds gebruikt voor een andere bron! Wilt u de gewiste gegevensbron weer herstellen, dan moet u eerst de naam van de andere bron wijzigen."; + Message[ french ] = "Le nom de la source de donnes supprime a dj t attribu une autre source que vous devez commencer par renommer afin de pouvoir restaurer l'ancienne."; + Message[ spanish ] = "El nombre de la fuente de datos borrada se ha asignado ya a otra fuente. Deber cambiarle el nombre para poder restaurar la antigua fuente de datos."; +- Message[ italian ] = "Il nome della sorgente dati eliiminata gi stato attribuito a un'altra. Prima di procedere, necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata."; ++ Message[ italian ] = "Il nome della sorgente dati eliminata gi stato attribuito a un'altra. Prima di procedere, necessario cambiare nome alla seconda sorgente dati prima di poter ripristinare quella eliminata."; + Message[ danish ] = "Du har allerede givet en anden datakilde den slettede datakildes navn! Du skal omdbe den frste datakilde for at kunne gendanne den aktuelle."; + Message[ swedish ] = "Du har redan gett namnet p den raderade datakllan till en annan dataklla! Du mste byta namn p den andra datakllan fr att kunna terstlla den aktuella datakllan."; + Message[ polish ] = "Nazwa usunitego rda danych zostaa przypisana innemu rdu danych. Aby mona byo przywrci usunite rdo danych, naley zmieni nazw tego drugiego."; +--- dbaccess/source/ui/dlg/AdabasPage.src.lang39 2004-09-09 18:23:40.000000000 +0200 ++++ dbaccess/source/ui/dlg/AdabasPage.src 2004-09-13 09:20:14.304832247 +0200 +@@ -87,7 +87,7 @@ + Text[ dutch ] = "~Grootte gegevensbuffer (MB)"; + Text[ french ] = "~Taille du tampon de donnes (Mo)"; + Text[ spanish ] = "Tamao de la ~memoria intermedia (MB):"; +- Text[ italian ] = "Dimensione tamponamento dei dati (MB):"; ++ Text[ italian ] = "Dimensione buffer dati (MB):"; + Text[ danish ] = "Data~bufferstrrelse (MB)"; + Text[ swedish ] = "Datab~uffertstorlek (MB):"; + Text[ polish ] = "Wielko ~bufora danych (MB)"; +--- desktop/source/app/desktop.src.lang39 2004-09-09 18:58:53.000000000 +0200 ++++ desktop/source/app/desktop.src 2004-09-13 09:20:14.325832666 +0200 +@@ -265,7 +265,7 @@ + Message[ french ] = "%PRODUCTNAME %PRODUCTVERSION n'a pas pu lancer le Setup de Java. Quittez %PRODUCTNAME et dmarrez le Setup de %PRODUCTNAME %PRODUCTVERSION. Choisissez 'Rparation'."; + Message[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION no pudo iniciar el programa de instalacin de Java. Cierre %PRODUCTNAME e inicie el programa de instalacin de %PRODUCTNAME %PRODUCTVERSION. Seleccione 'Reparar'."; + Message[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION could not start the Java Setup. Exit %PRODUCTNAME and start the %PRODUCTNAME %PRODUCTVERSION Setup. Choose 'Repair'."; +- Message[ italian ] = "%PRODUCTNAME %PRODUCTVERSION non riuscito ad avviare l'installazione di Java. Chiudete %PRODUCTNAME e avviate il programma di installazione di %PRODUCTNAME %PRODUCTVERSION. Sceliete l'opzione 'Riparazione'."; ++ Message[ italian ] = "%PRODUCTNAME %PRODUCTVERSION non riuscito ad avviare l'installazione di Java. Chiudete %PRODUCTNAME e avviate il programma di installazione di %PRODUCTNAME %PRODUCTVERSION. Scegliete l'opzione 'Riparazione'."; + Message[ danish ] = "%PRODUCTNAME %PRODUCTVERSION kunne ikke starte Java-installationen. Afslut %PRODUCTNAME og start installationsprogrammet for %PRODUCTNAME %PRODUCTVERSION. Vlg 'Reparer'."; + Message[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION kunde inte starta Java Setup. Avsluta %PRODUCTNAME och starta %PRODUCTNAME %PRODUCTVERSION Setup. Vlj 'Reparera'."; + Message[ polish ] = "%PRODUCTNAME %PRODUCTVERSION could not start the Java Setup. Exit %PRODUCTNAME and start the %PRODUCTNAME %PRODUCTVERSION Setup. Choose 'Repair'."; +@@ -1379,7 +1379,7 @@ + Text[ french ] = "Impossible d'tablir une connexion la configuration centrale ! "; + Text[ spanish ] = "No se ha podido establecer ninguna conexin con la configuracin central. "; + Text[ finnish ] = "A connection to the central configuration could not be established. "; +- Text[ italian ] = "impossibile realizzare un colleamento con la configurazione centrale. "; ++ Text[ italian ] = "impossibile realizzare un collegamento con la configurazione centrale. "; + Text[ danish ] = "Der kunne ikke oprettes forbindelse til den centrale konfiguration. "; + Text[ swedish ] = "Det gick inte att koppla till den centrala konfigurationen. "; + Text[ polish ] = "A connection to the central configuration could not be established. "; +@@ -1751,7 +1751,7 @@ + Text[ french ] = "Configuration dfectueuse de java.ini"; + Text[ spanish ] = "Configuracin defectuosa de java.ini "; + Text[ finnish ] = "Defective java.ini Configuration"; +- Text[ italian ] = "Configurazione difettossa di java.ini"; ++ Text[ italian ] = "Configurazione difettosa di java.ini"; + Text[ danish ] = "Defekt konfiguration af java.ini"; + Text[ swedish ] = "Felaktig java.ini-konfiguration"; + Text[ polish ] = "Defective java.ini Configuration"; +@@ -2069,7 +2069,7 @@ + Text[ portuguese ] = "The following internal error has occured: "; + Text[ russian ] = "The following internal error has occured: "; + Text[ spanish ] = "Se ha producido el error interno siguiente: "; +- Text[ italian ] = "Si verficato il seguente errore interno: "; ++ Text[ italian ] = "Si verificato il seguente errore interno: "; + Text[ swedish ] = "Fljande interna fel har uppsttt: "; + Text[ polish ] = "The following internal error has occured: "; + Text[ portuguese_brazilian ] = "O seguinte erro interno ocorreu: "; +--- extensions/source/dbimport/importdialog.src.lang39 2004-09-09 18:32:25.000000000 +0200 ++++ extensions/source/dbimport/importdialog.src 2004-09-13 09:20:14.644839029 +0200 +@@ -2905,7 +2905,7 @@ + Text[ dutch ] = "Fout bij toegang tot $path$."; + Text[ french ] = "Erreur d'accs $path$."; + Text[ spanish ] = "Error al acceder a $path$."; +- Text[ italian ] = "Impossibile acedere a $path$."; ++ Text[ italian ] = "Impossibile accedere a $path$."; + Text[ danish ] = "Der opstod en fejl, da du forsgte at f adgang til $path$."; + Text[ swedish ] = "tkomst till $path$ r inte mjlig."; + Text[ polish ] = "Bd dostpu do $path$."; +@@ -3136,7 +3136,7 @@ + Text[ dutch ] = "Document $name$ kan niet worden geladen.\nDe naam van de gegevensbron die gebruikt wordt voor het formulier kan niet worden aangepast. U kunt deze handmatig aanpassen."; + Text[ french ] = "Impossible de charger le document $name$ !\nIl n'a pas t possible d'ajuster le nom de la source de donnes avec lequel le formulaire travaille, si bien que vous devrez ventuellement le faire manuellement."; + Text[ spanish ] = "No se pudo cargar el documento $name$.\nEl nombre de la fuente de datos con el que trabaja el formulario no se pudo ajustar, por lo que quizs deber hacerlo a mano."; +- Text[ italian ] = "Impossibile caricare il documento $name$.\nImpossibile adattare il nome della sorgente dati utilizzata dal formulario per questo necesario effettuare l'operazione manualmente."; ++ Text[ italian ] = "Impossibile caricare il documento $name$.\nImpossibile adattare il nome della sorgente dati utilizzata dal formulario per questo necessario effettuare l'operazione manualmente."; + Text[ danish ] = "Dokumentet $name$ kunne ikke indlses.\nNavnet p den datakilde, som formularen arbejder med, kunne ikke tilpasses. Det skal du eventuelt gre manuelt p et senere tidspunkt."; + Text[ swedish ] = "Det gick inte att ladda dokumentet $name$.\nDet gick inte att anpassa namnet p datakllan som formulret arbetar med, s eventuellt mste du gra detta manuellt i efterhand."; + Text[ polish ] = "Zaadowanie dokumentu $name$ nie byo moliwe.\nNie udao si dopasowa nazwy rda danych, z ktrym wsppracuje formularz. By moe trzeba to bdzie zrobi samodzielnie."; +--- extensions/source/dbpilots/listcombopages.src.lang39 2004-09-09 18:33:33.000000000 +0200 ++++ extensions/source/dbpilots/listcombopages.src 2004-09-13 09:20:14.646839069 +0200 +@@ -391,7 +391,7 @@ + Text [ dutch ] = "De inhoud van het geselecteerde veld wordt in de lijst onder het combinatieveld weergegeven."; + Text [ french ] = "Le contenu du champ slectionn sera affich dans la liste de la zone combine."; + Text [ spanish ] = "El contenido del campo seleccionado se mostrar en la lista del cuadro combinado."; +- Text [ italian ] = "Il contenuto del campo selezionto viene mostrato nell'elenco della casella combinata."; ++ Text [ italian ] = "Il contenuto del campo selezionato viene mostrato nell'elenco della casella combinata."; + Text [ danish ] = "Indholdet af det valgte felt vises p kombinationsfeltets liste."; + Text [ swedish ] = "Innehllet i det utvalda fltet visas i kombinationsfltets lista."; + Text [ polish ] = "Zawarto wybranego pola zostanie wywietlona na licie pola kombi."; +--- offmgr/source/offapp/dialog/internationaloptions.src.lang39 2004-09-09 17:54:10.000000000 +0200 ++++ offmgr/source/offapp/dialog/internationaloptions.src 2004-09-13 09:20:14.292832008 +0200 +@@ -329,7 +329,7 @@ + Text[ french ] = "Uniquement pour le document actif"; + Text[ spanish ] = "~Slo para el documento actual"; + Text[ finnish ] = "~Current document only"; +- Text[ italian ] = "Solo per il docuemnto attivo"; ++ Text[ italian ] = "Solo per il documento attivo"; + Text[ danish ] = "~Kun for nuvrende dokument"; + Text[ swedish ] = "Bara fr ~aktuellt dokument"; + Text[ polish ] = "~Current document only"; +--- padmin/source/padialog.src.lang39 2004-09-09 18:58:00.000000000 +0200 ++++ padmin/source/padialog.src 2004-09-13 09:20:14.653839209 +0200 +@@ -572,7 +572,7 @@ + Text[ dutch ] = "Het lettertype wordt niet genstalleerd omdat het lettertypenbestand \n %s\n niet kan worden gekopieerd."; \ + Text[ french ] = "Copie du fichier de police\n %s\n impossible, donc impossibilit d'installer la police !"; \ + Text[ spanish ] = "No se pudo copiar el archivo de fuente\n %s\n, por lo que no se instalar la fuente."; \ +- Text[ italian ] = "Impossibile compiare il file del tipo di carattere\n %s\n. Il tipo di carattere non stato installato."; \ ++ Text[ italian ] = "Impossibile copiare il file del tipo di carattere\n %s\n. Il tipo di carattere non stato installato."; \ + Text[ danish ] = "Skrifttypefilen\n %s\nkunne ikke kopieres. Skrifttypen bliver ikke installeret."; \ + Text[ swedish ] = "Det gick inte att kopiera teckensnittsfilen\n %s\n. Teckensnittet installeras inte."; \ + Text[ polish ] = "Skopiowanie pliku czcionki\n %s\nnie byo moliwe. Czcionka nie zostanie zainstalowana."; \ +@@ -3938,7 +3938,7 @@ + Text[ dutch ] = "Printer \"%s\" kan niet worden gemporteerd omdat deze geen geldige configuratie heeft."; \ + Text[ french ] = "L'imprimante \"%s\" n'a pas t correctement configure et ne peut donc pas tre importe."; \ + Text[ spanish ] = "La impresora \"%s\" no est correctamente configurada, por lo que no se puede importar."; \ +- Text[ italian ] = "La stampante \"%s\" ha una configuraziopne non valida e per questo non pu essere importata."; \ ++ Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non pu essere importata."; \ + Text[ danish ] = "Printeren \"%s\" har ingen gyldig konfiguration og kan derfor ikke importeres."; \ + Text[ swedish ] = "Det gr inte att importera skrivaren \"%s\" eftersom den inte r fullstndigt konfigurerad."; \ + Text[ polish ] = "Drukarki \"%s\" nie mona importowa, poniewa nie zostaa prawidowo skonfigurowana."; \ +@@ -4636,7 +4636,7 @@ + Text[ french ] = "Connecter un priphrique fax"; + Text[ spanish ] = "Conectar a un fa~x"; + Text[ finnish ] = "Kytke ~faksilaite"; +- Text[ italian ] = "Aggingi un fa~x"; ++ Text[ italian ] = "Aggiungi un fa~x"; + Text[ danish ] = "Forbind en fa~xenhed"; + Text[ swedish ] = "Anslut en fa~xlsning"; + Text[ polish ] = "Podcz ~faks"; +@@ -5773,7 +5773,7 @@ + Text[ dutch ] = "een speciale ~driver voor het aanpassen van de opmaakattributen aan die van een andere printer"; + Text[ french ] = "Pilote spcifique pour adaptation du formatage une autre imprimante"; + Text[ spanish ] = "~Controlador especfico para adaptar el formato a otra impresora"; +- Text[ italian ] = "un driver specifico per adattare la formattazione a un'altra stamapante"; ++ Text[ italian ] = "un driver specifico per adattare la formattazione a un'altra stampante"; + Text[ danish ] = "en bestemt ~driver for at tilpasse formateringen til en anden printer"; + Text[ swedish ] = "en specifik drivru~tin fr att anpassa formateringen till en annan skrivare"; + Text[ polish ] = "~Specjalny sterownik dostosowujcy format do wymaga innej drukarki"; +--- padmin/source/rtsetup.src.lang39 2004-09-09 18:58:14.000000000 +0200 ++++ padmin/source/rtsetup.src 2004-09-13 09:20:14.656839268 +0200 +@@ -1353,7 +1353,7 @@ + Text[ dutch ] = "door ~printerlettertype"; + Text[ french ] = "Par la police d'~imprimante"; + Text[ spanish ] = "por la ~fuente de la impresora"; +- Text[ italian ] = "da caratteri della stamapante"; ++ Text[ italian ] = "da caratteri della stampante"; + Text[ danish ] = "med ~printerskrifttype"; + Text[ swedish ] = "med s~krivarteckensnitt"; + Text[ polish ] = "na czcionk ~drukarki"; +--- sc/addin/datefunc/dfa.src.lang39 2004-09-09 20:00:40.000000000 +0200 ++++ sc/addin/datefunc/dfa.src 2004-09-13 09:20:14.518836516 +0200 +@@ -1267,7 +1267,7 @@ + Text[ dutch ] = "Geeft als resultaat het aantal dagen in een jaar bij een bepaalde datum"; + Text[ french ] = "Renvoie le nombre de jours dans l'anne en relation avec la date indique."; + Text[ spanish ] = "Devuelve el nmero de das del ao en relacin a la fecha introducida. "; +- Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una deteminata data"; ++ Text[ italian ] = "Restituisce il numero dei giorni dell'anno per una determinata data"; + Text[ danish ] = "Returnerer antal dage i det angivne r"; + Text[ swedish ] = "Bestmmer antalet dagar i ret till ett datum"; + Text[ polish ] = "Zwraca liczb dni w roku w odniesieniu do podanej daty"; +--- sc/source/ui/src/globstr.src.lang39 2004-09-09 20:08:16.000000000 +0200 ++++ sc/source/ui/src/globstr.src 2004-09-13 09:20:14.536836875 +0200 +@@ -4064,7 +4064,7 @@ + Text = "Der Bereich enthlt keine Spaltenkpfe.\nSoll die erste Zeile als Spaltenkpfe verwendet werden?" ; + Text [ ENGLISH ] = "This area does not contain column headers.\nUse the first line as column headers?" ; \ + Text [ norwegian ] = "Dette omrdet inneholder ingen kolonneoverskrifter.\nVil du bruke den frste linja som overskrift?" ; \ +- Text [ italian ] = "L' area non contiene intestazioni per le colonne.\nUsare la prima riga come intestazione colonna?" ; \ ++ Text [ italian ] = "L'area non contiene intestazioni per le colonne.\nUsare la prima riga come intestazione colonna?" ; \ + Text [ portuguese_brazilian ] = "O intervalo no contm cabealhos de colunas.\nDeseja utilizar a primeira linha como cabealho de coluna?" ; \ + Text [ portuguese ] = "Esta rea no contm cabealhos de colunas.\nUtilizar a primeira linha como cabealho de coluna?" ; \ + Text [ finnish ] = "Alue ei sisll sarakeotsikoita.\nHaluatko ensimmist rivi kytettvn sarakeotsikkona?" ; \ +@@ -5698,7 +5698,7 @@ + Text [ ENGLISH ] = "Error creating the Data Pilot Table." ; + Text [ dutch ] = "Fout bij het maken van DataPiloot-tabel" ; + Text [ english_us ] = "Error creating the Data Pilot Table." ; +- Text [ italian ] = "Erore nella creazione della tabella DataPilot" ; ++ Text [ italian ] = "Errore nella creazione della tabella DataPilot" ; + Text [ spanish ] = "Error al crear la tabla del Piloto de Datos." ; + Text [ french ] = "Erreur lors de la cration de la table du pilote de donnes" ; + Text [ swedish ] = "Fel nr Datapilot-tabell skapades." ; +@@ -6825,7 +6825,7 @@ + Text = "Dieser Bereich wurde bereits eingefgt." ; + Text [ ENGLISH ] = "This area already has been inserted." ; + Text [ norwegian ] = "Dette omrdet er alt satt inn." ; +- Text [ italian ] = "Ques'area gi stata inserita." ; ++ Text [ italian ] = "Quest'area gi stata inserita." ; + Text [ portuguese_brazilian ] = "Este intervalo j foi inserido." ; + Text [ portuguese ] = "Esta rea j foi inserida." ; + Text [ finnish ] = "Tm alue on jo listty." ; +@@ -12581,7 +12581,7 @@ + Text [ ENGLISH ] = "Hide table" ; + Text [ dutch ] = "Werkblad verbergen" ; + Text [ english_us ] = "Hide sheet" ; +- Text [ italian ] = "Nacondi la tabella" ; ++ Text [ italian ] = "Nascondi la tabella" ; + Text [ spanish ] = "Ocultar hoja" ; + Text [ french ] = "Masquer feuille" ; + Text [ swedish ] = "Dlj tabell" ; +--- sc/source/ui/src/scstring.src.lang39 2004-09-09 20:12:14.000000000 +0200 ++++ sc/source/ui/src/scstring.src 2004-09-13 09:20:14.542836994 +0200 +@@ -5158,7 +5158,7 @@ + Text[ french ] = "Les cellules dans lesquelles vous voulez insrer des donnes contiennent dj des donnes.\ncraser les donnes existantes ?"; \ + Text[ spanish ] = "Las celdas en las que quiere insertar datos ya contienen datos.\nDesea sobrescribir los datos existentes?"; \ + Text[ finnish ] = "Do you want to replace the contents of the destination cells?"; \ +- Text[ italian ] = "Le celle in cui volete inserire i dati contengono gi dei dati.\nVolete soprascriverli?"; \ ++ Text[ italian ] = "Le celle in cui volete inserire i dati contengono gi dei dati.\nVolete sovrascriverli?"; \ + Text[ danish ] = "Du er ved at indstte data i celler, der allerede indeholder data.\nEr du sikker p, at du vil overskrive eksisterende data?"; \ + Text[ swedish ] = "Cellerna som du vill klistra in data i innehller redan data.\nVill du verkligen skriva ver dessa data?"; \ + Text[ polish ] = "Do you want to replace the contents of the destination cells?"; \ +--- scaddins/source/analysis/analysis.src.lang39 2004-09-09 18:35:41.000000000 +0200 ++++ scaddins/source/analysis/analysis.src 2004-09-13 09:20:14.571837573 +0200 +@@ -3011,7 +3011,7 @@ + Text[ french ] = "Multiple auquel arrondir le nombre."; + Text[ spanish ] = "El valor al cual se desea redondear."; + Text[ finnish ] = "Luvun pyristystarkkuus"; +- Text[ italian ] = "Il multilpo a cui arrotondare il valore."; ++ Text[ italian ] = "Il multiplo a cui arrotondare il valore."; + Text[ danish ] = "Vrdien, hvis multiplum der skal afrundes til."; + Text[ swedish ] = "Vrdet vars multipel talet ska avrundas till."; + Text[ polish ] = "Wielokrotno, do ktrej naley zaokrgli liczb."; +@@ -6187,7 +6187,7 @@ + Text[ french ] = "Nombre dcimal"; + Text[ spanish ] = "Nmero decimal"; + Text[ finnish ] = "Muunnettava desimaaliluku"; +- Text[ italian ] = "Numero deciamle"; ++ Text[ italian ] = "Numero decimale"; + Text[ danish ] = "Det decimaltal der skal konverteres"; + Text[ swedish ] = "Decimaltal"; + Text[ polish ] = "Liczba dziesitna do konwersji."; +--- sch/source/core/glob.src.lang39 2004-09-09 19:16:31.000000000 +0200 ++++ sch/source/core/glob.src 2004-09-13 09:20:14.374833643 +0200 +@@ -669,7 +669,7 @@ + Text [ ENGLISH ] = "Negative and Zero-Values cannot be shown logarithmic." ; + Text [ dutch ] = "Negatieve waarden en nul-waarden kunnen niet logaritmisch worden weergegeven." ; + Text [ english_us ] = "Negative and zero values cannot be logarithmicaly portrayed." ; +- Text [ italian ] = "Valori nulli e negativi non possono essere rappresentati logaritmamente." ; ++ Text [ italian ] = "Valori nulli e negativi non possono essere rappresentati logaritmicamente." ; + Text [ spanish ] = "No es posible representar logartmicamente valores cero o valores negativos." ; + Text [ french ] = "Valeurs ngatives et valeurs zro ne peuvent tre affiches sous forme de logarithme" ; + Text [ swedish ] = "Negativa vrden och nollvrden kan inte visas logaritmiskt." ; +--- sch/source/ui/app/strings.src.lang39 2004-09-09 19:17:35.000000000 +0200 ++++ sch/source/ui/app/strings.src 2004-09-13 09:20:14.381833783 +0200 +@@ -891,7 +891,7 @@ + Text [ ENGLISH ] = "Normal with lines" ; + Text [ dutch ] = "Normaal met lijnen" ; + Text [ english_us ] = "Normal with lines" ; +- Text [ italian ] = "Normale con liee" ; ++ Text [ italian ] = "Normale con linee" ; + Text [ spanish ] = "Normal con lneas" ; + Text [ french ] = "Normal avec lignes" ; + Text [ swedish ] = "Normal med linjer" ; +--- sd/sdi/sdslots.src.lang39 2004-09-09 19:05:04.000000000 +0200 ++++ sd/sdi/sdslots.src 2004-09-13 09:20:14.338832925 +0200 +@@ -4949,7 +4949,7 @@ + SlotName[ dutch ] = "Plakpunt verticaal gecentreerd"; + SlotName[ french ] = "Point de collage verticalement centr"; + SlotName[ spanish ] = "Punto de adhesin vertical centro"; +- SlotName[ italian ] = "Punto di incollaggio cetrato in verticale"; ++ SlotName[ italian ] = "Punto di incollaggio centrato in verticale"; + SlotName[ danish ] = "Klbepunkt lodret centreret"; + SlotName[ swedish ] = "Fstpunkt vertikalt centrerat"; + SlotName[ polish ] = "Punkt sklejenia porodku w pionie"; +@@ -6080,7 +6080,7 @@ + SlotName[ dutch ] = "Lijn met pijl-/cirkeluiteinde"; + SlotName[ french ] = "Ligne avec flche/cercle"; + SlotName[ spanish ] = "Lnea con flecha/crculo al final"; +- SlotName[ italian ] = "Linea con cerchio/freccia teminale"; ++ SlotName[ italian ] = "Linea con cerchio/freccia terminale"; + SlotName[ danish ] = "Streg med pilespids/cirkel"; + SlotName[ swedish ] = "Linje med pil-/cirkelslut"; + SlotName[ polish ] = "Linia ze strzak-kkiem"; +@@ -6127,7 +6127,7 @@ + SlotName[ dutch ] = "Lijn met pijluiteinde"; + SlotName[ french ] = "Ligne avec flche la fin"; + SlotName[ spanish ] = "Lnea con flecha al final"; +- SlotName[ italian ] = "Linea con freccia teminale"; ++ SlotName[ italian ] = "Linea con freccia terminale"; + SlotName[ danish ] = "Streg med pilespids"; + SlotName[ swedish ] = "Linje med pilslut"; + SlotName[ polish ] = "Linia ze strzak na kocu"; +@@ -6174,7 +6174,7 @@ + SlotName[ dutch ] = "Lijn met pijl-/vierkantuiteinde"; + SlotName[ french ] = "Ligne avec flche/carr"; + SlotName[ spanish ] = "Lnea con flecha/cuadrado al final"; +- SlotName[ italian ] = "Linea con freccia/quadrato teminale"; ++ SlotName[ italian ] = "Linea con freccia/quadrato terminale"; + SlotName[ danish ] = "Streg med pilespids/kvadrat"; + SlotName[ swedish ] = "Linje med pil-/kvadratslut"; + SlotName[ polish ] = "Linia ze strzak-kwadratem"; +@@ -6268,7 +6268,7 @@ + SlotName[ dutch ] = "Lijn met pijluiteinden"; + SlotName[ french ] = "Ligne avec flches"; + SlotName[ spanish ] = "Lnea con puntas de flechas"; +- SlotName[ italian ] = "Linea con frecce teminale"; ++ SlotName[ italian ] = "Linea con frecce terminali"; + SlotName[ danish ] = "Streg med pilespidser"; + SlotName[ swedish ] = "Linje med pilslut"; + SlotName[ polish ] = "Linia ze strzakami"; +@@ -6694,7 +6694,7 @@ + SlotName[ dutch ] = "Paginalay-out wijzigen..."; + SlotName[ french ] = "Modifier la mise en page..."; + SlotName[ spanish ] = "Modificar diseo de diapositiva..."; +- SlotName[ italian ] = "Modifica layout di dispositiva..."; ++ SlotName[ italian ] = "Modifica layout di diapositiva..."; + SlotName[ danish ] = "Modificer diaslayout..."; + SlotName[ swedish ] = "ndra sidlayout..."; + SlotName[ polish ] = "Modyfikuj ukad slajdu..."; +--- sd/source/ui/app/menuids.src.lang39 2004-09-09 19:06:17.000000000 +0200 ++++ sd/source/ui/app/menuids.src 2004-09-13 09:20:14.346833085 +0200 +@@ -5067,7 +5067,7 @@ + Text [ english_us ] = "Fixed Ver~tical Bottom" ; \ + Text [ swedish ] = "Fixerad vertikalt ~nederkant" ; \ + Text [ danish ] = "Fikseret lodret bund" ; \ +- Text [ italian ] = "Fissato vertcalmente in ~basso" ; \ ++ Text [ italian ] = "Fissato verticalmente in ~basso" ; \ + Text [ spanish ] = "Fijado abajo ~verticalmente" ; \ + Text [ french ] = "Fix verticalement en bas" ; \ + Text [ portuguese_brazilian ] = "Inferior Ver~tical Fixo" ; \ +--- sd/source/ui/app/sdstring.src.lang39 2004-09-09 19:07:57.000000000 +0200 ++++ sd/source/ui/app/sdstring.src 2004-09-13 09:20:14.348833125 +0200 +@@ -569,7 +569,7 @@ + Text = "Die Bitmap wurde gendert und nicht gesichert. \nSie knnen die selektierte Bitmap ndern \noder eine neue Bitmap hinzufgen." ; + Text [ ENGLISH ] = "The bitmap was modified without save. You can modify the selected bitmap or add a new bitmap" ; + Text [ norwegian ] = "Bildet ble endret uten at det ble lagret. \nDu kan endre det valgte bildet\neller legge til et nytt." ; \ +- Text [ italian ] = "La bitmap stata modificata senza esseere salvata.\nPotete modificare la bitmap selezionata o aggiungerne una nuova." ; \ ++ Text [ italian ] = "La bitmap stata modificata senza essere salvata.\nPotete modificare la bitmap selezionata o aggiungerne una nuova." ; \ + Text [ portuguese_brazilian ] = "O bitmap foi modificado sem ser salvo. \nVoc pode modificar o bitmap selecionado \\ou adicionar um novo." ; \ + Text [ portuguese ] = "As modificaes feitas no bitmap no foram guardadas. Poder alterar o \nbitmap seleccionado ou adicionar um novo bitmap." ; \ + Text [ finnish ] = "Bittikarttaa ei tallennettu muokkauksen jlkeen. \nVoit vaihtaa valitun bittikartan tai list uuden." ; \ +--- sd/source/ui/app/strings.src.lang39 2004-09-09 19:08:22.000000000 +0200 ++++ sd/source/ui/app/strings.src 2004-09-13 09:20:14.370833564 +0200 +@@ -7357,7 +7357,7 @@ + Text [ ENGLISH ] = "The object name allready exists. Please choose another one" ; + Text [ dutch ] = "De objectnaam bestaat reeds. Typ een andere naam." ; + Text [ english_us ] = "The object name already exists. Please enter another name." ; +- Text [ italian ] = "Il nume dell'oggetto esiste gi. Digitarne un altro." ; ++ Text [ italian ] = "Il nome dell'oggetto esiste gi. Digitarne un altro." ; + Text [ spanish ] = "El nombre del objeto ya existe. Por favor escriba otro nombre." ; + Text [ french ] = "Le nom de cet objet existe dj. Veuillez entrer un autre nom." ; + Text [ swedish ] = "Objektnamnet finns redan. Mata in ett annat namn" ; +@@ -9803,7 +9803,7 @@ + Text = "Diese Aktion lscht die Seite '$'. \nDie Seite enthlt Zeichenobjekte!" ; + Text [ ENGLISH ] = "This action deletes the page '$'. \nThe page contains drawing objects!" ; + Text [ english_us ] = "This action deletes the page '$'. \nNote: the page contains drawing objects!" ; +- Text [ italian ] = "Tale operazione elimina la pagina $. \nLa paginacontiene oggetti di disegno!" ; ++ Text [ italian ] = "Tale operazione elimina la pagina $. \nLa pagina contiene oggetti di disegno!" ; + Text [ spanish ] = "Esta accin borrar la pgina $. \nLa pgina contiene objetos de dibujo!" ; + Text [ french ] = "Cette opration supprime la page '$'. \nCette page contient des objets de dessin !" ; + Text [ dutch ] = "Door deze handeling wordt pagina '$' verwijderd.\nDeze pagina bevat tekenobjecten!" ; +@@ -9966,7 +9966,7 @@ + Text[ french ] = "Cette action supprime la liste des oprations pouvant\ntre annules. Ceci n'affecte pas les modifications\napportes au document, mais empche de les annuler.\nVoulez-vous poursuivre et assigner\nle nouveau style de page ?"; + Text[ spanish ] = "Esta orden borra la lista de los pasos que se\npuedan deshacer. En el documento se conservarn las modificaciones\nrealizadas hasta ahora, pero no se podrn\ndeshacer ms. Desea continuar y asignar el nuevo\ndiseo de diapositiva?"; + Text[ finnish ] = "Tm toiminto poistaa toimintojen luettelon,\neik sit voi kumota. Edelliset asiakirjaan tehdyt muutokset ovat yh voimassa,\nmutta niit ei voi kumota. Haluatko jatkaa ja\nmritt uuden diarakenteen?"; +- Text[ italian ] = "Quest'azione elimina l'elenco delle fasi di lavoro da annullare./nLa modifiche effettuate fino a questo momento rimangono inalterate/nma non si possono pi annullare. Volete proseguire/ne assegnare il nuovo modello di diapositiva?"; ++ Text[ italian ] = "Quest'azione elimina l'elenco delle fasi di lavoro da annullare./nLe modifiche effettuate fino a questo momento rimangono inalterate/nma non si possono pi annullare. Volete proseguire/ne assegnare il nuovo modello di diapositiva?"; + Text[ danish ] = "Denne handling sletter listen over arbejdstrin, som kan fortrydes.\nTidligere ndringer i dokumentet bibeholdes, men kan ikke lngere fortrydes.\nVil du fortstte og tilfje det nye diasdesign?"; + Text[ swedish ] = "Den hr tgrden raderar listan med arbetssteg som\ngr att ngra. ndringar som har\ngjorts hittills i dokumentet finns kvar men gr\ninte att ngra lngre. Vill du fortstta\noch tilldela den nya sidformatmallen?"; + Text[ polish ] = "W wyniku tej akcji zostanie usunita lista operacji, ktre\nmona cofn. Zmiany dokonane\nw dokumencie zostan zachowane, nie mona\nich jednak cofn. Czy chcesz kontynuowa\ni tym samym przypisa nowy ukad slajdu?"; +@@ -10380,7 +10380,7 @@ + Text = "Diese Grafik ist mit dem Dokument verknpft. \nMchten Sie die Verknpfung aufheben, um die Grafik zu bearbeiten?" ; + Text [ English ] = "This is a linked graphic. \nDo you want to unlink the graphic in order to edit the graphic?" ; + Text [ norwegian ] = "Denne grafikken er koblet til et dokument. \nVil du fjerne tilkoblingen til dokumentet slik at du kan redigere bildet?" ; +- Text [ italian ] = "Questra immagine collegata con il documento. \nDesiderate scollegare l'immagine per poterla modificare?" ; ++ Text [ italian ] = "Questa immagine collegata con il documento. \nDesiderate scollegare l'immagine per poterla modificare?" ; + Text [ portuguese_brazilian ] = "Esta figura esta vinculada a um documento. \nDeseja desvincular a figura para que seja possvel edit-la?" ; + Text [ portuguese ] = "Esta imagem est ligada ao documento. \nRemover a ligao para editar a imagem?" ; + Text [ english_us ] = "This graphic is linked to a document. \nDo you want to unlink the graphic in order to edit it?" ; +@@ -10562,7 +10562,7 @@ + Text = "Die Version der Grafikdatei wird nicht untersttzt" ; + Text [ ENGLISH ] = "Version of graphic file not supported" ; + Text [ english_us ] = "This graphics file version is not supported" ; +- Text [ italian ] = "La verione del file grafico non supportata" ; ++ Text [ italian ] = "La versione del file grafico non supportata" ; + Text [ spanish ] = "La versin del archivo grfico no se admite" ; + Text [ french ] = "La version du fichier graphique n'est pas supporte" ; + Text [ dutch ] = "Deze versie van het grafische bestand wordt niet ondersteund" ; +@@ -11700,7 +11700,7 @@ + Text = "Originalgre" ; + Text [ ENGLISH ] = "Real Size" ; + Text [ norwegian ] = "Opprinnelig strrelse" ; +- Text [ italian ] = "Dimensione orginale" ; ++ Text [ italian ] = "Dimensione originale" ; + Text [ portuguese_brazilian ] = "Tamanho Original" ; + Text [ portuguese ] = "Tamanho real" ; + Text [ finnish ] = "Alkuperinen koko" ; +@@ -14549,7 +14549,7 @@ + Text = "Schlangenlinie von links" ; + Text [ ENGLISH ] = "Wavyline from left" ; + Text [ english_us ] = "Wavy Line From Left" ; +- Text [ italian ] = "Serpentina da sinsitra" ; ++ Text [ italian ] = "Serpentina da sinistra" ; + Text [ spanish ] = "Serpentina desde la izquierda" ; + Text [ french ] = "Ligne ondule partir de la gauche" ; + Text [ dutch ] = "Slangenlijn van links" ; +@@ -20399,7 +20399,7 @@ + Text [ portuguese_brazilian ] = "Deseja adicionar o som Galeria?" ; + Text [ swedish ] = "Vill du lgga till ljudet till Gallery-temat?" ; + Text [ danish ] = "Skal lyden tilfjes til Galleriet?" ; +- Text [ italian ] = "Aggiungere lil suono all'argomento Gallery?" ; ++ Text [ italian ] = "Aggiungere il suono all'argomento Gallery?" ; + Text [ spanish ] = "Desea aadir el sonido al tema Gallery?" ; + Text [ french ] = "Voulez-vous ajouter le son au thme de la Gallery ?" ; + Text [ dutch ] = "Wilt u het geluid opnemen in de gallery?" ; +@@ -20941,7 +20941,7 @@ + Text = "Diese Grafik ist mit dem Dokument verknpft. Mchten Sie die Verknpfung aufheben, um die Grafik zu bearbeiten?" ; + Text [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ; + Text [ norwegian ] = "Denne grafikken er koblet til et dokument. Vil du koble den fra dokumentet for redigere den?" ; +- Text [ italian ] = "Questra immagine collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ; ++ Text [ italian ] = "Questa immagine collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ; + Text [ portuguese_brazilian ] = "Esta figura est vinculada a um documento. Deseja desvincul-la para que se possa edit-la?" ; + Text [ portuguese ] = "Esta imagem est ligada ao documento. Deseja remover a ligao para poder editar a imagem?" ; + Text [ english_us ] = "This graphic is linked to a document. Do you want to unlink the graphic in order to edit it?" ; +@@ -21711,7 +21711,7 @@ + { + Text = "Es existiert bereits ein Design mit diesem Namen\nSoll es berschrieben werden?"; + Text [ ENGLISH ] = "A design with the same name already exists\nShould it be replaced?"; +- Text[ italian ] = "Un design con questo nome esiste gi.\nVolete sovrasciverlo?"; ++ Text[ italian ] = "Un progetto con questo nome esiste gi.\nVolete sovrasciverlo?"; + Text[ portuguese_brazilian ] = "J existe um design com este nome.\nDeseja substitu-lo?"; + Text[ portuguese ] = "J existe um Design com este mesmo nome\nSubstituir?"; + Text[ danish ] = "Der findes allerede et design med dette navn.\nSkal det overskrives?"; +--- sd/source/ui/app/pseudo.src.lang39 2000-09-18 18:48:30.000000000 +0200 ++++ sd/source/ui/app/pseudo.src 2004-09-13 09:20:14.372833603 +0200 +@@ -111,7 +111,7 @@ + HelpText [ ENGLISH ] = "Insert a Checkbox" ; + Slotname [ english_us ] = "Insert Checkbox" ; + HelpText [ english_us ] = "Insert a checkbox" ; +- Slotname [ italian ] = "InserisciChekcBox" ; ++ Slotname [ italian ] = "InserisciCheckBox" ; + HelpText [ italian ] = "Inserisci una Checkbox" ; + Slotname [ spanish ] = "InsertarCasillaControl" ; + HelpText [ spanish ] = "Inserta un cuadro de verificacin" ; +--- setup2/source/custom/jvmsetup/jvmdlg.src.lang39 2004-09-09 18:44:15.000000000 +0200 ++++ setup2/source/custom/jvmsetup/jvmdlg.src 2004-09-13 09:20:14.462835399 +0200 +@@ -1359,7 +1359,7 @@ + TEXT = "Mit diesem Dialog whlen Sie die Java Umgebung aus, die von %PRODUCTNAME verwendet werden soll. Wurde bei der automatischen Suche keine verwendbare Java Version gefunden, so knnen Sie ber die Funktion \"Manuell Suchen...\" eine schon auf dem System vorhandene Java Umgebung angeben.\n\n\"Manuell suchen...\" ffnet einen Dialog, mit dem Sie ein Verzeichnis selektieren knnen. Geben Sie hier das Stammverzeichnis der Java Installation (JavaHome) an. Nach der Besttigung wird die getroffene Wahl verifiziert. Kann die angegeben VM benutzt werden, so wird ein entsprechender Eintrag an die Liste der vorhandenen Umgebungen gehngt. Tritt ein Fehler auf, so wird dies durch eine Meldung mitgeteilt.\n\nDie verwendete Laufzeitumgebung knnen Sie jederzeit nachtrglich verndern.\nRufen Sie dafr, im Ordner ..\%PRODUCTNAME%PRODUCTVERSION\program, das Programm "jvmsetup.exe" auf. Wenn Sie keine Java Umgebung auswhlen, werden Java Applets, JavaScripte oder Datenbankzugriffe ber JDBC ausgefhrt werden." ; + TEXT[ ENGLISH ] = "In this dialog select the Java Environment which %PRODUCTNAME should run.\nIf Office cannot use any version, install a corresponding Environment.\nIn the README file in the Office folder you can find more information about the Java support in %PRODUCTNAME and about the installation of a Java Environment.\nThe Runtime Environment used can be modified any time later on.\n You can modify the Runtime Environment by selecting the \"JVM Setup\" entry in the Bookmarks/Java folder of the Explorer.\nIf no Java Environment has been selected, neither Java (Applets) nor JavaScript will be executed." ; + TEXT[ english_us ] = "Use this dialog to select the Java environment to be used by %PRODUCTNAME. If the automatic search found no usable Java version, use \"Browse...\" to select a Java environment already existing on the system.\n\n\"Browse...\" opens a dialog in which a directory can be selected. Enter the root directory of the Java installation (JavaHome). After confirmation the selection will be verified. If the VM entered can be used, a corresponding entry is added to the list of the existing environments. If an error occurs, a message appears. \n\nThe Runtime Environment used can be modified at any future point.\nGo to the Explorer and select the entry \"Java Setup\" in the Bookmarks/Java folder. If you do not select a Java environment neither Java (Applets) nor JavaScript can be run." ; +- TEXT[ italian ] = "In questo dialogo potete selezionare il Java Environment che dovr essere usato da %PRODUCTNAME. Se con la ricerca automatica non viene individuata nessuna versione Java utilizzabile, ricercate il Java Environment installato nel vostro sistema servendovi della funzione \"Sfoglia...\".\n\nCon \"Sfoglia...\" aprite un dialogo con il quale potete scegliere una cartella. Specificate qui il nome della cartella di origine (root) dell'installazione Java (JavaHome). Dopo la conferma, verr verificata la scelta. Se la VM indicata pu essere utilizzata verr aggiunta la voce corrispondente all'elenco degli environment disponibili. In caso di errore apparir un messaggio.\n\n possibile modificare il Runtime Environment in qualsiasi momento.\nPer questa operazione nella cartella Bookmark/Java che si trova nell'Explorer, selezionate la voce \"Java setup\". Se non viene selezionato nessun Java Environment non verranno eseguiti n Java (Applets) n JavaScript.\n\nIl dialogo esegue tutte le modifiche necessarie nel file INI (soffice.ini). Con le relative modifiche manuali delle voci possibile personalizzare il Java Environment in uso. Qui di seguito vengono illustrate le voci pi importanti. Fate attenzione alle lettere maiuscole o miniscole delle voci:\n\nJava:\nattiva (1) o disattiva (0) il supporto Java. Se il valore impostato sullo 0 tutte le altre impostazioni Java verranno ignorate.\n\nHome:\n indica la cartella in cui stato installato il Runtime Environment (JavaHome).\n\nVersione:\nindica la versione Java installata.\n\nSystemClasspath:\ndefinisce il percorso di ricerca di tutte le classi Java (CLASSPATH) necessarie all'avvio del Java Environment (ad esempio classes.zip o rt.jar e r18i.jar). Le classi che non fanno parte del Runtime Environment generalmente vengono riportate nello UserClasspath.\n\nUserClasspath:\nqui appaiono tutte le classi che non appartengono direttamente al Runtime Environment. L'intero Classpath, che si trasmetter al Java VM, composto dal SystemClasspath e dall'UserCl sspath.\n\nRuntimeLib: indica il DLL Java (con il relativo percorso) che di solito javai.dll (Java 1.1.x) oppure jvm.dll (Java 1.2.x). Il DLL deve contenere tutte le funzioni JNI necessarie all'inizializzazione e all'avvio di Java VM.\n\nPer ulteriori voci o informazioni pi dettagliate sull'uso di Runtime Environment di Java in Office, leggete il file README."; ++ TEXT[ italian ] = "In questo dialogo potete selezionare il Java Environment che dovr essere usato da %PRODUCTNAME. Se con la ricerca automatica non viene individuata nessuna versione Java utilizzabile, ricercate il Java Environment installato nel vostro sistema servendovi della funzione \"Sfoglia...\".\n\nCon \"Sfoglia...\" aprite un dialogo con il quale potete scegliere una cartella. Specificate qui il nome della cartella di origine (root) dell'installazione Java (JavaHome). Dopo la conferma, verr verificata la scelta. Se la VM indicata pu essere utilizzata verr aggiunta la voce corrispondente all'elenco degli environment disponibili. In caso di errore apparir un messaggio.\n\n possibile modificare il Runtime Environment in qualsiasi momento.\nPer questa operazione nella cartella Bookmark/Java che si trova nell'Explorer, selezionate la voce \"Java setup\". Se non viene selezionato nessun Java Environment non verranno eseguiti n Java (Applets) n JavaScript.\n\nIl dialogo esegue tutte le modifiche necessarie nel file INI (soffice.ini). Con le relative modifiche manuali delle voci possibile personalizzare il Java Environment in uso. Qui di seguito vengono illustrate le voci pi importanti. Fate attenzione alle lettere maiuscole o minuscole delle voci:\n\nJava:\nattiva (1) o disattiva (0) il supporto Java. Se il valore impostato sullo 0 tutte le altre impostazioni Java verranno ignorate.\n\nHome:\n indica la cartella in cui stato installato il Runtime Environment (JavaHome).\n\nVersione:\nindica la versione Java installata.\n\nSystemClasspath:\ndefinisce il percorso di ricerca di tutte le classi Java (CLASSPATH) necessarie all'avvio del Java Environment (ad esempio classes.zip o rt.jar e r18i.jar). Le classi che non fanno parte del Runtime Environment generalmente vengono riportate nello UserClasspath.\n\nUserClasspath:\nqui appaiono tutte le classi che non appartengono direttamente al Runtime Environment. L'intero Classpath, che si trasmetter al Java VM, composto dal SystemClasspath e dall'UserCl sspath.\n\nRuntimeLib: indica il DLL Java (con il relativo percorso) che di solito javai.dll (Java 1.1.x) oppure jvm.dll (Java 1.2.x). Il DLL deve contenere tutte le funzioni JNI necessarie all'inizializzazione e all'avvio di Java VM.\n\nPer ulteriori voci o informazioni pi dettagliate sull'uso di Runtime Environment di Java in Office, leggete il file README."; + TEXT[ portuguese ] = "Seleccione nesta caixa de dilogo o ambiente Java a ser utilizado pelo %PRODUCTNAME.\nSe a procura automtica no encontrar nenhuma verso Java que possa ser utilizada, poder indicar por meio da funo \"Pesquisar...\" um ambiente Java j existente no sistema.\n\nEsta funo abrir uma caixa de dilogo que lhe permite seleccionar um directrio. Indique aqui o directrio-raz (JavaHome) da instalao Java. Depois de confirmar, a sua escolha ser verificada. Se a mquina virtual (VM) Java puder ser utilizada, a entrada correspondente ser adicionada lista dos ambientes existentes. Se surgir algum erro, ver uma mensagem de erro.\n\nPoder modificar o ambiente de execuo Java a qualquer altura.\nPara isso bastar seleccionar no Explorer a pasta \"Bookmarks/Java\" e aqui a entrada \"Java Setup\". Se no seleccionar nenhum ambiente Java, no ser possvel executar nem Java (Apllets) nem JavaScript.\n\\Poder fazer todas as modificaes necessrias no ficheiro INI (soffice.ini). Por meio de modificaes manuais adequadas poder personalizar o ambiente Java utilizado. A seguinte lista apresenta-lhe as entradas mais importantes. Tome em ateno as maisculas e minsculas:\n\nJava:\nActiva (1) ou Desactiva(0) o suporte Java. Se o valor for 0, sero ignoradas todas as outras predefinies Java.\n\nHome:\nIndica o directrio da instalao Java (JavaHome).\n\nVerso:\nIndica a verso de Java instalada.\n\nSystemClasspath:\nDefine o atalho de procura para todas as classes de Java (CLASSPATH) absolutamente necessrias ao ambiente Java (ex.: classes.zip ou rt.jar e r18i.jar). As classes no pertencentes ao ambiente de execuo Java deveriam ser listadas em UserClasspath.\n\nUserClasspath:\nDever incluir todas as classes que no pertenam ao ambiente de execuo. O Classpath completo transmitido mquina virtual Java composto pelos atalhos SystemClasspath e UserClasspath.\n\nRuntimeLib:\nIndica o ficheiro DLL de Java a ser utilizado (com indicao dos atalhos). Geralmente estes so: javai.dll (Jav 1.1.x), jvm.dll (Java 1.2.x) O ficheiro DLL ter que conter todas as funes JNI necessrias inicializao e arranque da mquina virtual (VM) Java.\n\nEncontrar outras entradas e informaes mais detalhadas sobre a utilizao do ambiente de execuo Java Runtime no Office no ficheiro README."; + TEXT[ russian ] = " Java, %PRODUCTNAME. Java, , \" ...\" Java.\n\n\" ...\" , . Java (JavaHome). . VM , . , .\n\n .\n / Java \" Java\". Java, Java (), JavaScript .\n\n INI (soffice.ini). , Java. . :\n\nJava:\n (1) (0) Java. 0, Java .n\nHome:\n , Java (JavaHome).\n\n:\n Java.\n\nSystemClasspath:\n Java (CLASSPATH), Java (.,classes.zip rt.jar r18i.jar). , , , , UserClasspath.\n\nUserClasspath:\n , . Classpath, Java VM, SystemClasspath UserClasspath.\n\nRuntimeLib:\n Java DLL ( ). , , javai.dll (Java 1.1.x) jvm.dll (Java 1.2.). DLL JNI, Java VM.\n\n , Java Office README."; + TEXT[ dutch ] = "In deze dialoog kiest u de Java-omgeving voor %PRODUCTNAME. Mocht er geen passende Java-versie te vinden zijn dan kunt u een reeds in uw systeem voorhanden Java-omgeving aangeven via de functie \"Handmatig zoeken...\".\n\nMet deze functie wordt er een dialoog geopend waarin u een directory kunt selecteren. Geef hier de homedirectory van de Java-installatie (JavaHome) aan en bevestig dit. Uw keuze wordt dan geverifieerd. Kan deze worden gebruikt dan wordt er een item toegevoegd aan de lijst van voorhanden omgevingen. Mocht er een fout optreden dan verschijnt er een melding.\n\nHet gebruikte runtime-environment kan te allen tijde worden gewijzigd.\nSelecteer hiervoor de optie \"Java Setup\" in de Bookmarks/Java-map in de explorer.\nSelecteert u geen Java omgeving dan wordt er geen Java (Applets) of JavaScript uitgevoerd.\n\nIn de dialoog komen alle noodzakelijke veranderingen van het INI-bestand (soffice.ini) voor. U kunt hierin handmatig veranderingen aanbrengen om de Java-omgeving aan te passen aan uw wensen, Hieronder vindt u een overzicht van de belangrijkste opties. Let op hoofdletters en kleine letters.\n\nJava:\ninschakelen (1) en uitschakelen (0) van de Java-ondersteuning. Staat de waarde op 0 dan worden alle andere Java-instellingen genegeerd.\n\nHome:\nde directory waarin Java Runtime Envireonment is genstalleerd (JavaHome).\n\nVersion:\nde genstalleerde versie.\n\nSystemClaspath:\\het zoekpad voor alle Java-klassen (CLASSPATH) die noodzakelijk zijn om de Java-omgeving te kunnen starten (bijv. classes.zip of rt.jar en r18i.jar). Klassen die niet tot het runtime-environment behoren moeten in de regel in het UserClasspath voorkomen.\n\nUserClasspath:\\hierin moeten alle klassen voorkomen die niet direct behoren tot het runtime environment. SystemClasspath en UserClasspath vormen samen het complete classpath dat wordt overgedragen aan Java VM.\n\\RuntimeLib:\nbevat de JavaDLL (met padaanduiding), meestal javai.dll (Java 1.1.x) of jvm.dll (Java 1.2.x). DLL moet alle JNI-functies bevatten ie noodzakelijk zijn voor het initialiseren en het starten van Java VM.\n\nAndere opties zoals gedetailleerde gegevens m.b.t. de besturing van het Java Runtime Environment onder Office vindt u in het README-bestand."; +--- setup2/source/ui/pages/maindlg.src.lang39 2004-09-09 18:46:33.000000000 +0200 ++++ setup2/source/ui/pages/maindlg.src 2004-09-13 09:20:14.465835459 +0200 +@@ -556,7 +556,7 @@ + Text = " KB bentigt. Bevor Sie die Installation erneut starten,\nstellen Sie bitte sicher, dass soviel Speicherplatz frei ist." ; + Text [ English ] = " KB. Before you start the installation again,\nplease make sure that there is enough memory.\n" ; + Text [ norwegian ] = " KB. Kontroller at det er nok ledig plass\nfr du starter installasjonen p nytt." ; +- Text [ italian ] = "KB. Prima di avviare di nuovo l'nstallazione,\nassicuratevi che vi sia memoria sufficiente." ; ++ Text [ italian ] = "KB. Prima di avviare di nuovo l'installazione,\nassicuratevi che vi sia memoria sufficiente." ; + Text [ portuguese_brazilian ] = "KB so necessrios. Antes de reiniciar a instalao,\ncertifique-se de que h espao suficiente disponvel.\n." ; + Text [ portuguese ] = "KB. Antes de reiniciar a instalao,\ncertifique-se de que existe memria suficiente disponvel." ; + Text [ finnish ] = "kilotavua Ennen kuin kynnistt asennuksen uudelleen,\nvarmista, ett tallennustilaa on riittvsti." ; +@@ -1059,7 +1059,7 @@ + Text [ portuguese_brazilian ] = "O %PRODUCTNAME %PRODUCTVERSION no pode ser instalado no diretrio escolhido, por que o sistema de arquivos no tem suporte para vnculos simblicos. Escolha outro diretrio. " ; + Text [ swedish ] = "Det gr inte att installera %PRODUCTNAME %PRODUCTVERSION i katalogen som du har valt eftersom filsystemet inte har ngot std fr symboliska lnkar. Vlj en annan katalog." ; + Text [ danish ] = "%PRODUCTNAME %PRODUCTVERSION kan ikke installeres i det valgte katalog, da filsystemet ikke understtter symbolske henvisninger. Vlg et andet katalog." ; +- Text [ italian ] = "Impossibile installare %PRODUCTNAME %PRODUCTVERSION nella cartella indicata perch il file system non supporta i collegamenti simbolici. Selezionate un'altra cartella." ; ++ Text [ italian ] = "Impossibile installare %PRODUCTNAME %PRODUCTVERSION nella cartella indicata perch il file system non supporta i collegamenti simbolici. Selezionate un'altra cartella." ; + Text [ spanish ] = "%PRODUCTNAME %PRODUCTVERSION no se puede instalar en el directorio seleccionado porque el sistema de archivos no admite enlaces simblicos. Seleccione otro directorio." ; + Text [ french ] = "Impossible d'installer %PRODUCTNAME %PRODUCTVERSION dans le rpertoire slectionn : ce systme de fichiers ne supporte pas les liens symboliques. Choisissez un autre rpertoire." ; + Text [ dutch ] = "%PRODUCTNAME %PRODUCTVERSION kan niet in de opgegeven directory worden genstalleerd, omdat dat bestandssysteem geen symbolische links ondersteunt. Kies a.u.b. een andere directory." ; +--- setup2/source/ui/pages/passrv.src.lang39 2004-09-09 18:47:41.000000000 +0200 ++++ setup2/source/ui/pages/passrv.src 2004-09-13 09:20:14.466835478 +0200 +@@ -168,7 +168,7 @@ + Text [ portuguese_brazilian ] = "O nome do computador no qual o servidor %1 ser executado." ; + Text [ swedish ] = "Namnet p datorn dr %1 servern skall kras." ; + Text [ danish ] = "Navnet p computeren som %1 serveren udfres p." ; +- Text [ italian ] = "Il mome del computer nel quale in server %1 in esecuzione." ; ++ Text [ italian ] = "Il nome del computer nel quale in server %1 in esecuzione." ; + Text [ spanish ] = "El nombre del ordenador en el que se ejecutar el servidor %1." ; + Text [ french ] = "Le nom de l'ordinateur sur lequel le serveur %1 va tre lanc." ; + Text [ dutch ] = "De naam van de computer waarop de %1 Server wordt uitgevoerd." ; +--- setup2/source/ui/pages/pcrc.src.lang39 2004-09-09 18:49:01.000000000 +0200 ++++ setup2/source/ui/pages/pcrc.src 2004-09-13 09:20:14.468835518 +0200 +@@ -173,7 +173,7 @@ + Text [ portuguese_brazilian ] = "contm arquivos compactados %2. As somas CRC para estes arquivos sero agora verificadas." ; + Text [ swedish ] = "innehller %2 komprimerade filer. Fr de hr filerna kontolleras just nu CRC-checksummorna." ; + Text [ danish ] = "indeholder %2 komprimerede filer. For disse filer bliver CRC-summen kontrolleret nu." ; +- Text [ italian ] = "contiene %2 file compressi. Per questi file verranno adesso controllate le checksum CRC." ; ++ Text [ italian ] = "contiene %2 file compressi. Per questi file verranno adesso controllati i checksum CRC." ; + Text [ spanish ] = "contiene %2 archivos comprimidos. Para estos archivos se comprobarn ahora las sumas CRC." ; + Text [ french ] = "contient %2 fichiers comprsss. Les sommes de contrle CRC vont maintenant tre vrifies pour ces fichiers." ; + Text [ dutch ] = "bevat %2 gecomprimeerde bestanden. Voor deze bestanden worden nu de CRC-checksommen gecontroleerd.." ; +--- setup2/source/ui/pages/ppatch.src.lang39 2004-09-09 18:50:54.000000000 +0200 ++++ setup2/source/ui/pages/ppatch.src 2004-09-13 09:20:14.469835538 +0200 +@@ -172,7 +172,7 @@ + Text[ french ] = "Cliquez sur '%1' pour actualiser %PRODUCTNAME %PRODUCTVERSION.\n\nCliquez sur '%2' pour quitter le programme d'installation."; + Text[ spanish ] = "Pulse '%1' para actualizar %PRODUCTNAME %PRODUCTVERSION.\n\nPulse '%2' para finalizar el programa de instalacin."; + Text[ finnish ] = "Asenna %PRODUCTNAME %PRODUCTVERSION -korjaus napsauttamalla kohdetta %1.\n\nPoistu asennusohjelmasta napsauttamalla kohdetta %2."; +- Text[ italian ] = "Fate clic su '%1' per aggiornare %PRODUCTNAME %PRODUCTVERSION.\n\nFate clic su '%2' per terminare il programma d'istallazione."; ++ Text[ italian ] = "Fate clic su '%1' per aggiornare %PRODUCTNAME %PRODUCTVERSION.\n\nFate clic su '%2' per terminare il programma d'installazione."; + Text[ danish ] = "Hvis du klikker p '%1' for at opdatere %PRODUCTNAME %PRODUCTVERSION.\n\nKlik p '%2' for at afslutte installationsprogrammet."; + Text[ swedish ] = "Klicka p '%1' om du vill uppdatera %PRODUCTNAME %PRODUCTVERSION.\n\nKlicka p '%2' om du vill avsluta installationsprogrammet."; + Text[ polish ] = "Kliknij przycisk %1, aby zainstalowa poprawk do programu %PRODUCTNAME %PRODUCTVERSION.\n\nKliknij przycisk %2, aby zakoczy program instalacyjny."; +--- setup2/source/ui/pages/pprofile.src.lang39 2004-09-09 18:51:07.000000000 +0200 ++++ setup2/source/ui/pages/pprofile.src 2004-09-13 09:20:14.471835578 +0200 +@@ -124,7 +124,7 @@ + Text[ dutch ] = "Kies hier de installatieprofielen die u later met het responsbestand wilt installeren."; + Text[ french ] = "Compilez les diffrents profils d'installation installer avec le Response File."; + Text[ spanish ] = "Determine aqu los diferentes perfiles de instalacin que desee instalar posteriormente con el Responsefile."; +- Text[ italian ] = "Raccogliete i diversi proifili di configurazione da installare in seguito con il response file."; ++ Text[ italian ] = "Raccogliete i diversi profili di configurazione da installare in seguito con il response file."; + Text[ danish ] = "Overst forskellige installationsprofiler, som du senere nsker at installere med svarfile."; + Text[ swedish ] = "Hr sammanstller du dina olika installationsprofiler som du vill installera senare med svarsfilen."; + Text[ polish ] = "Pocz rne profile instalacji, ktre pniej zostan zainstalowane przy uyciu pliku odpowiedzi."; +--- setup2/source/ui/pages/preadygo.src.lang39 2004-09-09 18:51:35.000000000 +0200 ++++ setup2/source/ui/pages/preadygo.src 2004-09-13 09:20:14.472835598 +0200 +@@ -169,7 +169,7 @@ + Text[ french ] = "Une installation de %PRODUCTNAME %PRODUCTVERSION a t dtecte sous :"; + Text[ spanish ] = "Se encontr una instalacin de %PRODUCTNAME %PRODUCTVERSION en: "; + Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION -asennus on lydetty kohteesta:"; +- Text[ italian ] = " stata trovata un'istallazione di %PRODUCTNAME %PRODUCTVERSION nel seguente percorso:"; ++ Text[ italian ] = " stata trovata un'installazione di %PRODUCTNAME %PRODUCTVERSION nel seguente percorso:"; + Text[ danish ] = "Installationen %PRODUCTNAME %PRODUCTVERSION blev fundet i flgende sti:"; + Text[ swedish ] = "En %PRODUCTNAME %PRODUCTVERSION-installation har hittats under:"; + Text[ polish ] = "Program %PRODUCTNAME %PRODUCTVERSION jest zainstalowany w:"; +@@ -319,7 +319,7 @@ + Text[ french ] = "L'espace disponible sur l'unit cible ne suffit pas pour l'installation de %PRODUCTPATCHNAME. L'installation requiert environ %SPACE_NEEDED Ko de plus."; + Text[ spanish ] = "La unidad de destino no dispone de espacio suficiente para instalar %PRODUCTPATCHNAME. Se requieren unos %SPACE_NEEDED KB ms."; + Text[ finnish ] = "Kohdeasemalla ei ole tarpeeksi tilaa kohteen %PRODUCTPATCHNAME asentamiseen. Listilaa tarvitaan noin %SPACE_NEEDED kt."; +- Text[ italian ] = "Il drive di destinazione non lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB."; ++ Text[ italian ] = "Il drive di destinazione non ha lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB."; + Text[ danish ] = "Der er ikke tilstrkkelig ledig plads p destinationsdrevet til at installere %PRODUCTPATCHNAME. Der krves ca. %SPACE_NEEDED KB yderligere."; + Text[ swedish ] = "Det finns inte tillrckligt med utrymme p mlenheten fr att %PRODUCTPATCHNAME ska kunna installeras. Det behvs ungefr %SPACE_NEEDED KB ytterligare."; + Text[ polish ] = "Za mao miejsca na dysku docelowym, aby zainstalowa aktualizacj %PRODUCTPATCHNAME. Potrzeba jeszcze okoo %SPACE_NEEDED KB."; +--- setup2/source/ui/pages/preins.src.lang39 2004-09-09 18:52:16.000000000 +0200 ++++ setup2/source/ui/pages/preins.src 2004-09-13 09:20:14.474835638 +0200 +@@ -414,7 +414,7 @@ + Text[ french ] = "Restauration de l'tat d'origine de votre installation de %1."; + Text[ spanish ] = "Restablece el estado original de la instalacin de %1."; + Text[ finnish ] = "Asentaa uudelleen kaikki ohjelmamoduulit, jotka asennettiin edellisen %1-asennuksen yhteydess."; +- Text[ italian ] = "Reinstalla tutti i moduli di programma gi presenti duranti l'installazione di %1."; ++ Text[ italian ] = "Reinstalla tutti i moduli di programma gi presenti durante l'installazione di %1."; + Text[ danish ] = "Gendanner %1-installationens oprindelige tilstand."; + Text[ swedish ] = "terstller din %1-installation till ursprungligt tillstnd."; + Text[ polish ] = "Przywraca pierwotny stan instalacji %1."; +--- setup2/source/ui/pages/prepair.src.lang39 2004-09-09 18:52:29.000000000 +0200 ++++ setup2/source/ui/pages/prepair.src 2004-09-13 09:20:14.476835678 +0200 +@@ -237,7 +237,7 @@ + Text[ dutch ] = "%1 vereist dit bestand om correct te kunnen worden uitgevoerd. Met het installatieprogramma kan dit bestand eventueel weer worden hersteld."; + Text[ french ] = "%1 ne peut pas tre excut correctement sans ce fichier. Le programme d'installation peut essayer de le restaurer."; + Text[ spanish ] = "%1 necesita este archivo para poder ser ejecutado con xito. El programa de instalacin puede intentar restaurar este archivo."; +- Text[ italian ] = "%1 richiede questo file per poter essere eseguito corretamente. Il programma d'installazione cercher di ripristinare questo file."; ++ Text[ italian ] = "%1 richiede questo file per poter essere eseguito correttamente. Il programma d'installazione cercher di ripristinare questo file."; + Text[ danish ] = "%1 har brug for denne fil for at kunne udfres fejlfrit. Installationsprogrammet kan prve p at genoprette denne fil." ; + Text[ swedish ] = "Den hr filen krver %1 fr att den skall kunna utfras utan ngra fel. Installationsprogrammet kan frska att terskapa filen."; + Text[ polish ] = "%1 wymaga tego pliku do prawidowego wykonania. Plik ten mona przywrci przy uyciu program instalacyjnego." ; +--- setup2/source/ui/pages/pupdate.src.lang39 2004-09-09 18:53:34.000000000 +0200 ++++ setup2/source/ui/pages/pupdate.src 2004-09-13 09:20:14.479835738 +0200 +@@ -641,7 +641,7 @@ + Text[ french ] = "L'installation en rseau existante de %PRODUCTNAME %PREVIOUSPRODUCTVERSION ne peut pas tre actualise depuis une installation monoutilisateur.\nPour actualiser l'installation en rseau, lancez le programme d'installation avec le paramtre '-net'. Cliquez sur '%CANCEL' pour quitter le programme d'installation ou sur '%OK' pour installer une version monoutilisateur dans un nouveau rpertoire."; + Text[ spanish ] = "La instalacin de red existente de %PRODUCTNAME %PREVIOUSPRODUCTVERSION no se puede actualizar despus de la instalacin monousuario.\nPara actualizar la instalacin de red inicie el programa de instalacin con el parmetro '-net'. Para interrumpir la instalacin pulse en 'CANCELAR' y para instalar una versin monousuario en un directorio nuevo pulse en 'ACEPTAR'."; + Text[ finnish ] = "If you want to update a network installation start the setup with the parameter: -net.\nClick '%1', if you want to install a single user version into a new folder.\nTo abort the setup click '%2'."; +- Text[ italian ] = "Impossibile aggiornare l'installazione di rete %PRODUCTNAME %PREVIOUSPRODUCTVERSION da un'instalalzione monoutente.\nPer aggiornare un'installazione di rete avviate il programma di installazione con il parametro '-net'. Per interrompere l'installazione fate click su '%CANCEL'. Per installare una versione monoutente in un'altra cartella cliccate '%OK'."; ++ Text[ italian ] = "Impossibile aggiornare l'installazione di rete %PRODUCTNAME %PREVIOUSPRODUCTVERSION da un'installazione monoutente.\nPer aggiornare un'installazione di rete avviate il programma di installazione con il parametro '-net'. Per interrompere l'installazione fate click su '%CANCEL'. Per installare una versione monoutente in un'altra cartella cliccate '%OK'."; + Text[ danish ] = "Din netvrksinstallation af %PRODUCTNAME %PREVIOUSPRODUCTVERSION kan ikke opdateres fra en enkeltbruger installation.\nFor at opdatere en netvrksinstallation skal du starte installationsprogrammet med parameteren '-net'. Klik p '%CANCEL' for at afbryde installationen eller '%OK' for at foretage en enkeltbruger installation i et andet katalog."; + Text[ swedish ] = "Det gr inte att uppdatera din existerande ntverksinstallation av %PRODUCTNAME %PREVIOUSPRODUCTVERSION frn en fristende installation.\nOm du vill uppdatera en ntverksinstallation startar du installationsprogrammet med parametern '-net'. Om du vill avsluta installationsprogrammet klickar du p '%CANCEL'. Annars klickar du p '%OK' fr att installera en fristende version i en ny katalog."; + Text[ polish ] = "If you want to update a network installation start the setup with the parameter: -net.\nClick '%1', if you want to install a single user version into a new folder.\nTo abort the setup click '%2'."; +--- setup2/source/ui/app.src.lang39 2004-09-09 18:45:11.000000000 +0200 ++++ setup2/source/ui/app.src 2004-09-13 09:20:14.484835837 +0200 +@@ -534,7 +534,7 @@ + Text [ portuguese_brazilian ] = "Verificando configuraes locais" ; + Text [ swedish ] = "Kontrollerar de lokala instllningarna" ; + Text [ danish ] = "Kontrollerer lokale indstillinger" ; +- Text [ italian ] = "Verifica delle impostzioni locali" ; ++ Text [ italian ] = "Verifica delle impostazioni locali" ; + Text [ spanish ] = "Verifica la configuracin local" ; + Text [ french ] = "Vrification des paramtres locaux" ; + Text [ dutch ] = "Lokale instellingen worden gecontroleerd" ; +@@ -816,7 +816,7 @@ + Text = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ; + Text [ English ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ; + Text [ norwegian ] = "Setup \nOpphavsrett (c) 1993 - 1996 av Star Division GmbH" ; +- Text [ italian ] = "Setup \nCopyrigth (c) 1993 - 1996 by Star Division GmbH" ; ++ Text [ italian ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ; + Text [ portuguese_brazilian ] = "Instalao \nCopyright (c) 1993 - 1996 - Star Division GmbH" ; + Text [ portuguese ] = "Setup \nCopyright (c) 1993 - 1996 by Star Division GmbH" ; + Text [ finnish ] = "Asennus \nCopyright (c) 1993 - 1996 Star Division GmbH" ; +--- setup2/source/ui/error.src.lang39 2004-09-09 18:45:27.000000000 +0200 ++++ setup2/source/ui/error.src 2004-09-13 09:20:14.489835937 +0200 +@@ -973,7 +973,7 @@ + Text = "Die Dateiliste fr die Upgrade-Installation ist leer.\nEs wurde eine falsche oder fehlerhafte Skriptdatei benutzt.\nDas Programm wird abgebrochen." ; + Text [ English ] = "The upgrade filelist is emptyYou use a wrong or defect scriptfile.\nProgram aborted." ; + Text [ english_us ] = "The upgrade file list is empty. \nYou may have utilized a wrong or defect script file.\nProgram aborted." ; +-Text [ italian ] = "L'elenco dei file per l'installazione di aggiormento vuoto.\nIl file di script utiizzato errato stato usato un file di script errato.\nIl programma viene interrotto." ; ++Text [ italian ] = "L'elenco dei file per l'installazione di aggiornamento vuoto.\nPotreste avere usato un file di script errato o difettoso.\nIl programma viene interrotto." ; + Text [ spanish ] = "La lista de archivos para la instalacin de actualizacin est vaca.\nSe ha utilizado un archivo script errneo o defectuoso.\nEl programa se cancelar." ; + Text [ french ] = "La liste des fichiers pour l'installation de la mise niveau est vide.\nVous vous tes tromp de fichier script ou avez utilis un fichier script dfectueux.\nInterruption du programme." ; + Text [ dutch ] = "De bestandslijst voor de Upgrade-installatie is leeg.\nEr is een verkeerd of foutief scriptbestand gebruikt.\nHet programma wordt geannuleerd." ; +@@ -1202,7 +1202,7 @@ + Text = "Das Installationsprogramm kann keine gemeinsam genutzten Dateien aktualisieren, wenn diese gerade verwendet werden.\nSchlieen Sie bitte alle geffneten Anwendungen, bevor Sie die Installation erneut starten." ; + Text [ English ] = "Setup cannot update shared files, when they are open.\nPlease close all applications before you start setup again." ; + Text [ english_us ] = "The setup program cannot update shared files when they are in use.\nPlease close all applications before restarting the setup." ; +-Text [ italian ] = "Il programma di installazione non pu aggionare i file comuni quando sono in uso.\nPrima di riavviare l'installazione chiudete tutte le applicazioni." ; ++Text [ italian ] = "Il programma di installazione non pu aggiornare i file comuni quando sono in uso.\nPrima di riavviare l'installazione chiudete tutte le applicazioni." ; + Text [ spanish ] = "El programa de instalacin no puede actualizar archivos utilizados en comn cuando estos estn siendo utilizados.\n Cierre, por favor, todas las aplicaciones activas antes de volver a iniciar la instalacin." ; + Text [ french ] = "Le programme d'installation ne peut actualiser des fichiers communs alors qu'ils sont ouverts.\nFermez toutes les applications ouvertes avant de redmarrer l'installation." ; + Text [ dutch ] = "Het installatieprogramma kan geen gemeenschappelijk gebruikte bestanden bijwerken als deze reeds zijn geopend.\nSluit alle geopende toepassingen voordat u de installatie opnieuw start." ; +@@ -1480,7 +1480,7 @@ + Text [ English ] = "Wrong comman line parameter: %1" ; + Text [ english_us ] = "Wrong command line parameter: %1" ; + Text [ dutch ] = "Foutieve commandoregelparameter: %1" ; +-Text [ italian ] = "Parametro della riga di comando errrato: %1" ; ++Text [ italian ] = "Parametro della riga di comando errato: %1" ; + Text [ spanish ] = "Parmetro de orden no vlido: %1" ; + Text [ french ] = "Paramtre de ligne de commande incorrecte : %1" ; + Text [ swedish ] = "Fel kommandoradparameter: %1" ; +@@ -1711,7 +1711,7 @@ + Text[ french ] = "Paramtre incomplet dans la ligne de commande : %1"; + Text[ spanish ] = "Parmetro en la lnea de comando incompleto: %1"; + Text[ finnish ] = "Incomplete command line parameter: %1"; +-Text[ italian ] = "Paramentro della riga di comando incompleto: %1"; ++Text[ italian ] = "Parametro della riga di comando incompleto: %1"; + Text[ danish ] = "Ufuldstndig kommandolinjeparameter: %1"; + Text[ swedish ] = "Ofullstndig kommandoradsparameter: %1"; + Text[ polish ] = "Incomplete command line parameter: %1"; +--- sfx2/sdi/sfxslots.src.lang39 2004-09-09 20:29:01.000000000 +0200 ++++ sfx2/sdi/sfxslots.src 2004-09-13 09:20:14.311832387 +0200 +@@ -5751,7 +5751,7 @@ + SlotName[ dutch ] = "Opniew"; + SlotName[ french ] = "Restaurer"; + SlotName[ spanish ] = "Restaurar"; +- SlotName[ italian ] = "Riprtistina"; ++ SlotName[ italian ] = "Ripristina"; + SlotName[ danish ] = "Gendan"; + SlotName[ swedish ] = "terstll"; + SlotName[ polish ] = "Ponw"; +--- sfx2/source/appl/app.src.lang39 2004-09-09 20:29:32.000000000 +0200 ++++ sfx2/source/appl/app.src 2004-09-13 09:20:14.318832526 +0200 +@@ -2335,7 +2335,7 @@ + Message = "Die Anwendung kann zur Zeit nicht beendet werden.\nBitte warten Sie das Ende aller Druckauftrge und/oder\nOLE-Aktivierungen ab und schlieen Sie alle Dialoge." ; + Message [ English ] = "Can't quit the application at this moment.\nPlease wait until all print jobs and/or\nOLE-activations are terminated and close\nall dialogs." ; + Message [ norwegian ] = "Kan ikke avslutte programmet for yeblikket.\nVent til alle skriverjobber og/eller \nOLE-handlinger er avsluttet og lukk alle dialogbokser." ; +- Message [ italian ] = "Impossibile uscire dall'applicazione in questo momento.\nAttendendete la concluisione della stampa e/o\n tutte le attivazioni OLE, quindi chiudete\ntutti i dialoghi." ; ++ Message [ italian ] = "Impossibile uscire dall'applicazione in questo momento.\nAttendete la conclusione della stampa e/o\n tutte le attivazioni OLE, quindi chiudete\ntutti i dialoghi." ; + Message [ portuguese_brazilian ] = "No foi possvel finalizar o aplicativo no momento.\nAguarde at que todas as \naes OLE e/ou as tarefas de impresso sejam concludas e feche todas as caixas de dilogo." ; + Message [ portuguese ] = "De momento impossvel sair desta aplicao.\nAguarde a impresso de todos os documentos\n e/ou o fim das activaes OLE e feche todos os dilogos." ; + Message [ french ] = "Impossible de quitter l'application maintenant.\nVeuillez attendre la fin des activits d'impression et/ou des activations OLE\net fermez tous les dialogues." ; +--- sfx2/source/bastyp/fltfnc.src.lang39 2004-09-09 20:30:46.000000000 +0200 ++++ sfx2/source/bastyp/fltfnc.src 2004-09-13 09:20:14.319832546 +0200 +@@ -209,7 +209,7 @@ + Text[ dutch ] = "De gekozen filter $(FILTER) is niet genstalleerd.\nWilt u dat nu doen?"; \ + Text[ french ] = "Le filtre $(FILTER) que vous avez slectionn n'est pas install\nSouhaitez-vous l'installer ?"; \ + Text[ spanish ] = "El filtro seleccionado $(FILTER) no ha sido instalado.\nDesea instalarlo?"; \ +- Text[ italian ] = "Il filtro selezionato $(FILTER) non stato instalalto.\nVolete installarlo adesso?"; \ ++ Text[ italian ] = "Il filtro selezionato $(FILTER) non stato installato.\nVolete installarlo adesso?"; \ + Text[ danish ] = "Det valgte filter $(FILTER) er ikke installeret.\nVil du installere det nu?"; \ + Text[ swedish ] = "Det utvalda filtret $(FILTER) r inte installerat.\nVill du gra det nu?"; \ + Text[ polish ] = "Wybrany filtr $(FILTER) nie jest zainstalowany.\nCzy to teraz zrobi ?"; \ +--- sfx2/source/bastyp/newhdl.src.lang39 2004-09-09 20:30:59.000000000 +0200 ++++ sfx2/source/bastyp/newhdl.src 2004-09-13 09:20:14.320832566 +0200 +@@ -117,7 +117,7 @@ + Text [ portuguese_brazilian ] = "Memria principal insuficiente. Feche outros aplicativos ou janelas antes de continuar." ; + Text [ swedish ] = "Inte tillrckligt med arbetsminne. Avsluta andra program eller stng ngra fnster innan du fortstter att arbeta." ; + Text [ danish ] = "Ikke tilstrkkelig hukommelse. Afslut venligst andre programmer eller luk nogle vinduer, fr du fortstter." ; +- Text [ italian ] = "La memoria principale scarsa. Prma di continuare a lavorare chiudere alcune applicazioni o alcune finestre." ; ++ Text [ italian ] = "La memoria principale scarsa. Prima di continuare a lavorare chiudere alcune applicazioni o alcune finestre." ; + Text [ spanish ] = "No hay suficiente memoria. Cierre por favor otras aplicaciones o algunas ventanas antes de continuar." ; + Text [ french ] = "La mmoire centrale se fait rare. Veuillez quitter quelques applications ou fermer quelques fentres avant de poursuivre." ; + Text [ dutch ] = "Onvoldoende schijfruimte. Beindig andere toepassingen of sluit een aantal vensters voordat u uw werk voortzet." ; +--- so3/src/svuidlg.src.lang39 2004-09-09 19:00:01.000000000 +0200 ++++ so3/src/svuidlg.src 2004-09-13 09:20:14.515836456 +0200 +@@ -2584,7 +2584,7 @@ + Text [ english_us ] = "Insert Plug-in" ; + Text [ swedish ] = "Infoga plug-in" ; + Text [ danish ] = "Indst PlugIn" ; +- Text [ italian ] = "Inserischi PlugIn" ; ++ Text [ italian ] = "Inserisci PlugIn" ; + Text [ spanish ] = "Insertar Plug-in" ; + Text [ french ] = "Insrer un Plug-in" ; + Text [ dutch ] = "PlugIn invoegen" ; +--- starmath/source/commands.src.lang39 2004-09-09 18:39:45.000000000 +0200 ++++ starmath/source/commands.src 2004-09-13 09:20:14.613838411 +0200 +@@ -1750,7 +1750,7 @@ + HelpId = HID_SMA_SBLANK; + Text = "kleiner Zwischenraum"; + Text [ ENGLISH ] = "small space" ; +- Text[ italian ] = "Spazio intemedio piccolo"; ++ Text[ italian ] = "Spazio intermedio piccolo"; + Text[ portuguese_brazilian ] = "Pequeno Intervalo"; + Text[ portuguese ] = "espaamento pequeno"; + Text[ danish ] = "Lille frirum"; +--- starmath/source/smres.src.lang39 2004-09-09 18:40:19.000000000 +0200 ++++ starmath/source/smres.src 2004-09-13 09:20:14.629838730 +0200 +@@ -17545,7 +17545,7 @@ + Text = "Linke Begrenzung erwartet" ; + Text [ ENGLISH ] = "Left delimiter expected" ; + Text [ english_us ] = "Left limit expected" ; +- Text [ italian ] = "Atteso limite sinisto" ; ++ Text [ italian ] = "Atteso limite sinistro" ; + Text [ spanish ] = "Se requiere el lmite izquierdo" ; + Text [ french ] = "Limite gauche requise" ; + Text [ dutch ] = "Linkerbegrenzing verwacht" ; +--- svtools/source/misc/errtxt.src.lang39 2004-09-09 19:57:20.000000000 +0200 ++++ svtools/source/misc/errtxt.src 2004-09-13 09:20:14.638838909 +0200 +@@ -4075,7 +4075,7 @@ + Text [ english_us ] = "The configuration of the icon display could not be deleted." ; + Text [ swedish ] = "Konfigurationen fr symbolvisningen kunde inte raderas." ; + Text [ danish ] = "Det var ikke muligt at slette ikonvisningens konfiguration" ; +- Text [ italian ] = "Impossibile cancellare la configurazione della rappresentazione dei simbol" ; ++ Text [ italian ] = "Impossibile cancellare la configurazione della rappresentazione dei simboli." ; + Text [ spanish ] = "No se pudo borrar la configuracin del panel de smbolos." ; + Text [ french ] = "Impossible de supprimer les paramtres d'affichage de l'icne" ; + Text [ portuguese ] = "Foi impossvel eliminar a configurao do painel de cones." ; +--- svx/sdi/enumslot.src.lang39 2001-05-17 17:13:50.000000000 +0200 ++++ svx/sdi/enumslot.src 2004-09-13 09:20:14.383833823 +0200 +@@ -208,7 +208,7 @@ + Slotname [ danish ] = "Beziermodus" ; + HelpText [ danish ] = "Vlg tegnfunktion Bezier" ; + Slotname [ italian ] = "Modo Bezier" ; +- HelpText [ italian ] = "Scegli la funzione di disegno Bezier" ; ++ HelpText [ italian ] = "Scegli la funzione di disegno Bzier" ; + Slotname [ spanish ] = "ModoBzier" ; + HelpText [ spanish ] = "Selecciona la funcin de Bezier de dibujo" ; + Slotname [ french ] = "Mode Bzier" ; +@@ -236,7 +236,7 @@ + Slotname [ danish ] = "Freihandmodus" ; + HelpText [ danish ] = "Zeichenfunktion Freihandzeichnen auswhlen" ; + Slotname [ italian ] = "A mano libera" ; +- HelpText [ italian ] = "Zeichenfunktion Freihandzeichnen auswhlen" ; ++ HelpText [ italian ] = "Seleziona il modo di disegno a mano libera" ; + Slotname [ spanish ] = "Dibujo a mano alzada" ; + HelpText [ spanish ] = "Selecciona el modo de dibujo a mano alzada" ; + Slotname [ french ] = "Mode A main leve" ; +@@ -262,7 +262,7 @@ + Slotname [ danish ] = "Lauftext" ; + HelpText [ danish ] = "Zeichenfunktion Lauftext auswhlen" ; + Slotname [ italian ] = "Testo scorrevole" ; +- HelpText [ italian ] = "Zeichenfunktion Lauftext auswhlen" ; ++ HelpText [ italian ] = "Seleziona il modo di animazione del testo" ; + Slotname [ spanish ] = "Texto animado" ; + HelpText [ spanish ] = "Selecciona la funcin de texto animado" ; + Slotname [ french ] = "Dfilement de texte" ; +--- svx/sdi/svxslots.src.lang39 2004-09-09 17:58:42.000000000 +0200 ++++ svx/sdi/svxslots.src 2004-09-13 09:20:14.396834082 +0200 +@@ -481,7 +481,7 @@ + SlotName[ dutch ] = "Uitgevuld"; + SlotName[ french ] = "Justifi"; + SlotName[ spanish ] = "Justificado"; +- SlotName[ italian ] = "Giustifcato"; ++ SlotName[ italian ] = "Giustificato"; + SlotName[ danish ] = "Lige margener"; + SlotName[ swedish ] = "Marginaljustering"; + SlotName[ polish ] = "Do lewej i prawej"; +@@ -13676,7 +13676,7 @@ + SlotName[ french ] = "Champ numrique"; + SlotName[ spanish ] = "Campo numrico"; + SlotName[ finnish ] = "Numeerinen kentt"; +- SlotName[ italian ] = "Campo numerico"; ++ SlotName[ italian ] = "Campo numerico"; + SlotName[ danish ] = "Numerisk felt"; + SlotName[ swedish ] = "Numeriskt flt"; + SlotName[ polish ] = "Pole liczbowe"; +--- svx/source/dialog/contdlg.src.lang39 2004-09-09 18:01:15.000000000 +0200 ++++ svx/source/dialog/contdlg.src 2004-09-13 09:20:14.399834142 +0200 +@@ -1141,7 +1141,7 @@ + Text = "Diese Grafik ist mit dem Dokument verknpft. Mchten Sie die Verknpfung aufheben, um die Grafik zu bearbeiten?" ; + Text [ English ] = "This is a linked graphic. Do you want to unlink the graphic in order to edit the graphic?" ; + Text [ norwegian ] = "Dette grafikkobjektet er lenket til dokumentet. Vil du oppheve lenken for redigere grafikkobjektet?" ; +- Text [ italian ] = "Questra immagine collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ; ++ Text [ italian ] = "Questa immagine collegata con il documento. Desiderate scollegare l'immagine per poterla modificare?" ; + Text [ portuguese_brazilian ] = "Este objeto grfico est vinculado ao documento. Deseja desvincular este objeto para poder edit-lo?" ; + Text [ portuguese ] = "Esta imagem est ligada ao documento. Deseja remover a ligao para poder editar a imagem?" ; + Text [ english_us ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ; +--- svx/source/dialog/hyperdlg.src.lang39 2004-09-09 18:03:51.000000000 +0200 ++++ svx/source/dialog/hyperdlg.src 2004-09-13 09:20:14.403834222 +0200 +@@ -4890,7 +4890,7 @@ + Text[ french ] = "Crez un lien vers un document existant ou une cible dans le document."; + Text[ spanish ] = "Crea un hiperenlace a un documento existente o a un destino dentro de un documento. "; + Text[ finnish ] = "This is where you create a hyperlink to an exisitng document or a target within a document."; +- Text[ italian ] = "Crea un hyperllink a un documento oppure a un punto interno di un file."; ++ Text[ italian ] = "Crea un hyperlink a un documento oppure a un punto interno di un file."; + Text[ danish ] = "Her opretter du et hyperlink til et eksisterende dokument eller et ml inde i et dokument."; + Text[ swedish ] = "Hr kan du skapa en hyperlnk till ett existerande dokument eller ett ml inom ett dokument."; + Text[ polish ] = "This is where you create a hyperlink to an exisitng document or a target within a document."; +--- svx/source/form/fmstring.src.lang39 2004-09-09 18:13:38.000000000 +0200 ++++ svx/source/form/fmstring.src 2004-09-13 09:20:14.411834381 +0200 +@@ -160,7 +160,7 @@ + Text [ portuguese_brazilian ] = "A entrada j existe.\nEscolha outro nome." ; \ + Text [ swedish ] = "Inmatningen finns redan.\nVar vnlig och vlj ett annat namn." ; \ + Text [ danish ] = "Elementet findes allerede.\nVlg venligst et andet navn." ; \ +- Text [ italian ] = "La voce esiste gii.\nScegliete un altro nome." ; \ ++ Text [ italian ] = "La voce esiste gi.\nScegliete un altro nome." ; \ + Text [ spanish ] = "El registro ya existe.\nPor favor elija otro nombre." ; \ + Text [ french ] = "Cette entre existe dj.\nVeuillez choisir un autre nom." ; \ + Text [ dutch ] = "Item bestaat reeds.\nKies een andere naam." ; \ +@@ -3892,7 +3892,7 @@ + Text = "Ersetzen eines Containerelements" ; + Text [ English ] = "Movement of #" ; + Text [ english_us ] = "Replace a container element" ; +- TEXT[ italian ] = "Sostituzione di un elemnto di container"; ++ TEXT[ italian ] = "Sostituzione di un elemento di container"; + TEXT[ portuguese_brazilian ] = "Substituir um elemento do recipiente"; + TEXT[ portuguese ] = "Substituir um elemento do contentor"; + TEXT[ danish ] = "Erstat et containerelement"; +--- svx/source/items/svxerr.src.lang39 2004-09-09 18:14:48.000000000 +0200 ++++ svx/source/items/svxerr.src 2004-09-13 09:20:14.413834421 +0200 +@@ -422,7 +422,7 @@ + TEXT[ french ] = "$(ARG1) n'est pas support par la vrification ou n'est actuellement pas actif.\nVrifiez l'installation et installez le cas chant le module de langue requis, ou activez-le sous 'Outils - Options - Paramtres linguistiques - Linguistique'."; \ + TEXT[ spanish ] = "$(ARG1) no est disponible para la revisin ortogrfica o no est activo en este momento.\n Examine la instalacin e instale en caso dado el idioma deseado\no active el mdulo correspondiente en 'Herramientas - Opciones - Configuracin de idiomas - Lingstica'."; \ + TEXT[ finnish ] = "$(ARG1) ei ole kytettviss oikeinkirjoituksen tarkistusta varten.\nTarkista asennetut osat ja asenna haluttu kieli.\n"; \ +- TEXT[ italian ] = "$(ARG1) non supportato per il controllo oppure non attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linquistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'."; \ ++ TEXT[ italian ] = "$(ARG1) non supportato per il controllo oppure non attivato al momento.\nControllate l'installazione ed installate, se necessario, la lingua desiderata\noppure impostate il modulo linguistico corrispondente in 'Strumenti - Opzioni - Impostazioni lingua - Linguistica'."; \ + TEXT[ danish ] = "$(ARG1) understttes ikke af stavekontrollen eller er ikke aktiveret i jeblikket.\nKontroller venligst installationen, og installer eventuelt det ndvendige sprogmodul,\neller aktiver det pgldende sprogmodul under 'Funktioner - Indstillinger - Sprogindstillinger - Skrivehjlp'."; \ + TEXT[ swedish ] = "$(ARG1) stds inte av kontrollen resp., r inte aktiverat fr nrvarande.\nKontrollera installationen och installera eventuellt den ndvndiga sprkmodulen\nresp. aktivera motsvarande sprkmodul under \"Verktyg - Alternativ - Sprkinstllningar - Lingvistik\"."; \ + TEXT[ polish ] = "$(ARG1) nie jest obsugiwany przez funkcj sprawdzania pisowni albo nie jest teraz aktywny.\nSprawd instalacj i ewentualnie zainstaluj wymagany modu jzyka\nlub uaktywnij go, wydajc sekwencj polece 'Narzdzia - Opcje - Konfiguracja jzykw - Pisownia'."; \ +@@ -1073,7 +1073,7 @@ + TEXT[ dutch ] = "De originele VBA Basic-code in dit document wordt niet opgeslagen."; + TEXT[ french ] = "Le code VBA basic d'origine contenu dans le document ne sera pas enregistr."; + TEXT[ spanish ] = "No se guardar el Basic Code VBA incluido en el documento."; +- TEXT[ italian ] = "Non possibile salvare il codice VBA Basic contenuto nel documeto."; ++ TEXT[ italian ] = "Non possibile salvare il codice VBA Basic contenuto nel documento."; + TEXT[ danish ] = "Den originale VBA Basic kode, som er indeholdt i dokumentet, gemmes ikke."; + TEXT[ swedish ] = "Original-VBA-Basic-koden som finns i dokumentet sparas inte."; + TEXT[ polish ] = "Zawarty w dokumencie oryginalny kod VBA nie zostanie zapisany."; +--- svx/source/items/svxitems.src.lang39 2004-09-09 18:15:07.000000000 +0200 ++++ svx/source/items/svxitems.src 2004-09-13 09:20:14.425834661 +0200 +@@ -3553,7 +3553,7 @@ + Text[ dutch ] = "Onderstreept (golf)"; + Text[ french ] = "Soulignage (ondulation)"; + Text[ spanish ] = "Subrayado (ondulado)"; +- Text[ italian ] = "Sottolienato (linea ondulata)"; ++ Text[ italian ] = "Sottolineato (linea ondulata)"; + Text[ danish ] = "Understreget (blger)"; + Text[ swedish ] = "Understruken (vg)"; + Text[ polish ] = "Podkrelenie (Fala)"; +@@ -13909,7 +13909,7 @@ + Text[ dutch ] = "teken $(ARG1) gedraaid"; + Text[ french ] = "Rotation des caractres : $(ARG1)"; + Text[ spanish ] = "Carcter rodado en $(ARG1)"; +- Text[ italian ] = "Carattere rotato di $(ARG1)"; ++ Text[ italian ] = "Carattere ruotato di $(ARG1)"; + Text[ danish ] = "Tegn roteret med $(ARG1)"; + Text[ swedish ] = "Tecken roterat med $(ARG1)"; + Text[ polish ] = "Znaki obrcone o $(ARG1)"; +--- svx/source/options/optinet2.src.lang39 2004-09-09 18:17:29.000000000 +0200 ++++ svx/source/options/optinet2.src 2004-09-13 09:20:14.430834760 +0200 +@@ -2035,7 +2035,7 @@ + Text = "~ndern" ; + Text [ English ] = "Chan~ge" ; + Text [ english_us ] = "~Modify" ; +- Text [ italian ] = "Modfica" ; ++ Text [ italian ] = "Modifica" ; + Text [ spanish ] = "Modificar" ; + Text [ french ] = "Modifier" ; + Text [ dutch ] = "Wij~zigen" ; +--- svx/source/svdraw/svdstr.src.lang39 2004-09-09 18:19:40.000000000 +0200 ++++ svx/source/svdraw/svdstr.src 2004-09-13 09:20:14.454835239 +0200 +@@ -2468,7 +2468,7 @@ + Text = "Bzierkurve" ; + Text [ ENGLISH ] = "bzier" ; + Text [ norwegian ] = "Bzierkurve" ; +- Text [ italian ] = "Curva di Bezier" ; ++ Text [ italian ] = "Curva di Bzier" ; + Text [ portuguese_brazilian ] = "Curva de Bzier" ; + Text [ portuguese ] = "Curvas Bzier" ; + Text [ finnish ] = "Bzier-kyr" ; +@@ -2515,7 +2515,7 @@ + Text = "Bzierkurven" ; + Text [ ENGLISH ] = "bziers" ; + Text [ norwegian ] = "Bzierkurver" ; +- Text [ italian ] = "Curve di Bezier" ; ++ Text [ italian ] = "Curve di Bzier" ; + Text [ portuguese_brazilian ] = "Curvas de Bzier" ; + Text [ portuguese ] = "Curvas Bzier" ; + Text [ finnish ] = "Bzier-kyrt" ; +@@ -2562,7 +2562,7 @@ + Text = "Bzierkurve" ; + Text [ ENGLISH ] = "bzier" ; + Text [ norwegian ] = "Bzierkurve" ; +- Text [ italian ] = "Curva di Bezier" ; ++ Text [ italian ] = "Curva di Bzier" ; + Text [ portuguese_brazilian ] = "Curva de Bzier" ; + Text [ portuguese ] = "Curvas Bzier" ; + Text [ finnish ] = "Bzier-kyr" ; +@@ -2609,7 +2609,7 @@ + Text = "Bzierkurven" ; + Text [ ENGLISH ] = "bziers" ; + Text [ norwegian ] = "Bzierkurver" ; +- Text [ italian ] = "Curve di Bezier" ; ++ Text [ italian ] = "Curve di Bzier" ; + Text [ portuguese_brazilian ] = "Curvas de Bzier" ; + Text [ portuguese ] = "Curvas Bzier" ; + Text [ finnish ] = "Bzier-kyrt" ; +@@ -10874,7 +10874,7 @@ + Text [ portuguese_brazilian ] = "%N pontos de %O" ; + Text [ swedish ] = "%N punkter fr %O" ; + Text [ danish ] = "%N punkt fra %O" ; +- Text [ italian ] = "%N punkti di %O" ; ++ Text [ italian ] = "%N punti di %O" ; + Text [ spanish ] = "%N Puntos de %O" ; + Text [ french ] = "%N points de %O" ; + Text [ dutch ] = "%N punten van %O" ; +@@ -15720,7 +15720,7 @@ + Text [ portuguese_brazilian ] = "Espaamento da borda direita" ; + Text [ swedish ] = "Hger ramavstnd" ; + Text [ danish ] = "Hjre kantafstand" ; +- Text [ italian ] = "Distanta destra cornice" ; ++ Text [ italian ] = "Distanza destra cornice" ; + Text [ spanish ] = "Borde derecho del marco" ; + Text [ french ] = "Bord droit du cadre" ; + Text [ dutch ] = "Rechterkaderafstand" ; +@@ -23894,7 +23894,7 @@ + Text[ dutch ] = "Aantal verplaatsbare lijnen"; + Text[ french ] = "Nombre de lignes dplaables"; + Text[ spanish ] = "Nm. lneas desplazables"; +- Text[ italian ] = "Numro linee mobili"; ++ Text[ italian ] = "Numero linee mobili"; + Text[ danish ] = "Antal flytbare linjer"; + Text[ swedish ] = "Antal frflyttningsbara linjer"; + Text[ polish ] = "Liczba linii przesuwalnych"; +@@ -25094,7 +25094,7 @@ + Text[ dutch ] = "Maateenheid"; + Text[ french ] = "Unit de mesure"; + Text[ spanish ] = "Unidad de medida"; +- Text[ italian ] = "Unit di musura"; ++ Text[ italian ] = "Unit di misura"; + Text[ danish ] = "Mleenhed"; + Text[ swedish ] = "Mttenhet"; + Text[ polish ] = "Jednostka miary"; +@@ -26532,7 +26532,7 @@ + Text[ dutch ] = "Hoogte, totaal"; + Text[ french ] = "Hauteur totale"; + Text[ spanish ] = "Alto, todo"; +- Text[ italian ] = "Alttezza completa"; ++ Text[ italian ] = "Altezza completa"; + Text[ danish ] = "Hjde, samlet"; + Text[ swedish ] = "Hjd totalt"; + Text[ polish ] = "Wysoko cznie"; +@@ -27300,7 +27300,7 @@ + Text[ dutch ] = "Herschalen X, compleet"; + Text[ french ] = "Redimensionner X pour tout"; + Text[ spanish ] = "Redimensin X, todo"; +- Text[ italian ] = "Risimensiona X completamente"; ++ Text[ italian ] = "Ridimensiona X completamente"; + Text[ danish ] = "Redimensioner X, samlet"; + Text[ swedish ] = "terstll X totalt"; + Text[ polish ] = "Zmie rozmiar X cznie"; +--- sw/sdi/swslots.src.lang39 2004-09-13 09:19:18.385716702 +0200 ++++ sw/sdi/swslots.src 2004-09-13 09:20:14.602838191 +0200 +@@ -308,7 +308,7 @@ + SlotName[ french ] = "AutoFormat pour la saisie"; + SlotName[ spanish ] = "Formateado automtico mientras se escribe"; + SlotName[ finnish ] = "Automaattinen muotoilu kirjoitettaessa"; +- SlotName[ italian ] = "Foramttazione automatica durante la digitazione"; ++ SlotName[ italian ] = "Formattazione automatica durante la digitazione"; + SlotName[ danish ] = "Anvend AutoFormat mens der indtastes"; + SlotName[ swedish ] = "AutoFormat vid inmatning"; + SlotName[ polish ] = "Autoformatowanie podczas pisania"; +@@ -962,7 +962,7 @@ + SlotName[ dutch ] = "Tot aan begin regel wissen"; + SlotName[ french ] = "Supprimer jusqu'au dbut de la ligne"; + SlotName[ spanish ] = "Borrar hasta el comienzo de la lnea"; +- SlotName[ italian ] = "Cancella fino all'inzio della riga"; ++ SlotName[ italian ] = "Cancella fino all'inizio della riga"; + SlotName[ danish ] = "Slet til begyndelsen af linjen"; + SlotName[ swedish ] = "Radera till brjan av rad"; + SlotName[ polish ] = "Usu do pocztku wiersza"; +@@ -5282,7 +5282,7 @@ + SlotName[ dutch ] = "Indexwijzer naar index"; + SlotName[ french ] = "Marque d'index l'index"; + SlotName[ spanish ] = "Marca de ndice al ndice"; +- SlotName[ italian ] = "Contrassegnno per l'indice"; ++ SlotName[ italian ] = "Contrassegno per l'indice"; + SlotName[ danish ] = "Indeksmarkering til indeks"; + SlotName[ swedish ] = "Indexmrke till index"; + SlotName[ polish ] = "Znacznik indeksu do indeksu"; +--- sw/source/ui/app/mn.src.lang39 2004-09-09 19:25:14.000000000 +0200 ++++ sw/source/ui/app/mn.src 2004-09-13 09:20:14.604838231 +0200 +@@ -192,7 +192,7 @@ + Text = "Tabellenbegrenz~ung" ; + Text [ English ] = "Grid lines" ; + Text [ norwegian ] = "Tabellgrenser" ; +- Text [ italian ] = "Limte tabella" ; ++ Text [ italian ] = "Limiti tabella" ; + Text [ portuguese_brazilian ] = "Limites da Tabela" ; + Text [ portuguese ] = "~Limites da tabela" ; + Text [ finnish ] = "Taulukon rajat" ; +@@ -669,7 +669,7 @@ + Text = "Zeichenobjekt Text" ; + Text [ English ] = "Draw object text" ; + Text [ english_us ] = "Draw Object text" ; +- Text [ italian ] = "Oggetto di diesegno testo" ; ++ Text [ italian ] = "Oggetto di disegno testo" ; + Text [ spanish ] = "Texto del objeto de dibujo" ; + Text [ french ] = "Texte objet de dessin" ; + Text [ dutch ] = "Tekenobject tekst" ; +--- sw/source/ui/uiview/view.src.lang39 2004-09-09 19:43:46.000000000 +0200 ++++ sw/source/ui/uiview/view.src 2004-09-13 09:20:14.607838291 +0200 +@@ -278,7 +278,7 @@ + MESSAGE = "Dieses Wort sollten Sie vermeiden! Thesaurus starten?" ; + MESSAGE [ English ] = "Please avoid this word! Start thesaurus?" ; + MESSAGE [ norwegian ] = "Dette ordet str p lista over ord du vil unng. Vil du starte synonymordlista?" ; +- MESSAGE [ italian ] = "Tale temine andrebbe evitato. Avviare il dizionario dei sinonimi?" ; ++ MESSAGE [ italian ] = "Tale termine andrebbe evitato. Avviare il dizionario dei sinonimi?" ; + MESSAGE [ portuguese_brazilian ] = "Esta palavra aparece na lista de palavras que voc deseja evitar! Iniciar Dicionrio de Correlatos?" ; + MESSAGE [ portuguese ] = "Evite esta palavra! Iniciar o dicionrio de sinnimos?" ; + MESSAGE [ finnish ] = "Tm sana esiintyy vltettvien sanojen luettelossa. Avataanko synonyymisanasto?" ; +--- sw/source/ui/utlui/attrdesc.src.lang39 2004-09-09 19:43:59.000000000 +0200 ++++ sw/source/ui/utlui/attrdesc.src 2004-09-13 09:20:14.610838351 +0200 +@@ -2332,7 +2332,7 @@ + TEXT = "Trennlinienbreite:" ; + TEXT [ English ] = "limiter width:" ; + Text [ english_us ] = "Separator Width:" ; +- Text [ italian ] = "Spessore linea di sepazione" ; ++ Text [ italian ] = "Spessore linea di separazione" ; + Text [ spanish ] = "Ancho de la lnea de separacin:" ; + Text [ french ] = "Largeur du trait de sparation :" ; + Text [ dutch ] = "breedte scheidingslijn:" ; +--- uui/source/cookiedg.src.lang39 2004-09-09 18:55:34.000000000 +0200 ++++ uui/source/cookiedg.src 2004-09-13 09:20:14.632838790 +0200 +@@ -528,7 +528,7 @@ + Text [ portuguese_brazilian ] = "O %PRODUCTNAME salvou no servidor '${HOST}' cookies que sero enviados quando voc solicitar o documento ${PATH}.\nOs cookies contm informaes referentes a certas classes de URLs. Eles so enviados por alguns servidores para o %PRODUCTNAME, onde sero salvos quando determinados documentos forem acessados. Se o %PRODUCTNAME carregar um documento que, de acordo com o URL, corresponda classe de um dos Cookies anteriormente recebidos, o %PRODUCTNAME enviar essas informaes ao servidor. Isso permitir que o servidor controle o status de um aplicativo WWW, por exemplo, quando fizer compras on-line.\n\nOs seguintes Cookies devem ser utilizados:\n\n" ; \ + Text [ swedish ] = "%PRODUCTNAME har sparat cookies fr servern '${HOST}, som skall skickas d dokumentet ${PATH} laddas.\nCookies r information som refererar till vissa URL-klasser. De skickas av vissa servrar till %PRODUCTNAME och sparas dr nr vissa dokument ppnas. Denna information skickas av %PRODUCTNAME till servern om %PRODUCTNAME vid ett senare tillflle laddar ett dokument, som enligt URL:en motsvarar en klass frn en cookie som har mottagits tidigare. P s stt kan servern knna igen tillstndet fr en WWW-tillmpning (t.ex. varor i en varukorg nr Du handlar online).\n\nFljande cookies skall tilldelas:\n\n" ; \ + Text [ danish ] = "%PRODUCTNAME har gemt cookies for serveren '${HOST}', som skal sendes, nr dokmentet ${PATH} lses.\nCookies er informationer, som relaterer til bestemte URL-klasser. De bliver sendt til %PRODUCTNAME af nogle servere og gemt der, nr bestemte dokumenter lses. Lser %PRODUCTNAME senere et dokument, hvis URLs klasse svarer til en fr modtaget cookie, sender %PRODUCTNAME denne information til serveren. Sledes kan serveren kontrollere et WWW-programs tilstand (f.eks. varer i din indkbskurv, nr du handler online).\n\nFlgende cookies skal sttes:\n\n" ; \ +- Text [ italian ] = "%PRODUCTNAME ha salvato per il server '${HOST}' dei cookies da inviare al momento della richiesta del documento ${PATH}.\nI cookies sono informazioni che si riferiscono a determinate classi di URL. Vengono inviati da alcuni server quando si richiamano determinati documenti a %PRODUCTNAME e qui salvati. Se %PRODUCTNAME in seguito richiede un documento che corrisponde all'URL di una classe di un cookie precedentemente ricevuto, tale informazione viene inviata da %PRODUCTNAME al server. In tal modo i server possono memorizzare lo stato di un'applicazione WWW (ad esempio gli articoli introdotti nel \"carrello\" di un supermercato elettronico).\n\n necessarion impostare i seguenti cookies:\n\n" ; \ ++ Text [ italian ] = "%PRODUCTNAME ha salvato per il server '${HOST}' dei cookies da inviare al momento della richiesta del documento ${PATH}.\nI cookies sono informazioni che si riferiscono a determinate classi di URL. Vengono inviati da alcuni server quando si richiamano determinati documenti a %PRODUCTNAME e qui salvati. Se %PRODUCTNAME in seguito richiede un documento che corrisponde all'URL di una classe di un cookie precedentemente ricevuto, tale informazione viene inviata da %PRODUCTNAME al server. In tal modo i server possono memorizzare lo stato di un'applicazione WWW (ad esempio gli articoli introdotti nel \"carrello\" di un supermercato elettronico).\n\n necessario impostare i seguenti cookies:\n\n" ; \ + Text [ spanish ] = "%PRODUCTNAME ha guardado cookies para el servidor '${HOST}' que sern enviadas cuando se solicite el documento ${PATH}.\nLas cookies son informaciones referentes a determinadas clases de URLs. Cuando se solicita un documento, algunos servidores las envan a %PRODUCTNAME y las guardan all. Si %PRODUCTNAME solicita ms tarde un documento que de acuerdo con su URL corresponda a una clase de una cookie recibida anteriormente, %PRODUCTNAME enviar esta informacin al servidor. As, los servidores pueden recordar el estado de una aplicacin www, como por ejemplo los artculos en la cesta de un sistema de compras.\n\nEstas son las cookies a instalar:\n\n" ; \ + Text [ french ] = "%PRODUCTNAME a enregistr des Cookies pour le serveur '${HOST}', qui seront envoys au moment de la requte du document ${PATH}.\nLes Cookies sont des informations se rapportant certaines classes d'URL. Plus tard, si %PRODUCTNAME requiert un document dont l'URL correspond la classe d'un Cookie dj reu, cette information est envoye au serveur. Ceci permet aux serveurs de reconnatre l'tat d'une application WWW (par ex. les articles placs dans le panier d'un systme d'achat).\n\nLes Cookies suivants vont tre placs : \n\n" ; \ + Text [ dutch ] = "%PRODUCTNAME heeft voor server '${HOST}' cookies opgeslagen die bij het opvragen van het document ${PATH} moeten worden verzonden.\nCookies zijn gegevens die betrekking hebben op bepaalde klassen URL's. Ze worden door veel servers bij het oproepen van bepaalde documenten naar %PRODUCTNAME verzonden en daar opgeslagen. Vraagt %PRODUCTNAME later een document op met een URL-klasse die overeenkomt met een klasse van een eerder ontvangen cookie, dan wordt deze informatie door %PRODUCTNAME naar de server verzonden. Zo kunnen servers de status van een WWW-toepassing onthouden (zoals de artikelen die in een winkel in een boodschappenmand zijn geplaatst).\n\nDe volgende cookies moeten worden toegepast:\n\n" ; \ +--- wizards/source/euro/euro.src.lang39 2004-09-09 20:17:23.000000000 +0200 ++++ wizards/source/euro/euro.src 2004-09-13 09:20:14.493836017 +0200 +@@ -1326,7 +1326,7 @@ + Text[ french ] = "Conversion galement pour les champs et les tableaux des textes."; + Text[ spanish ] = "Convertir tambin campos y tablas en documentos de texto."; + Text[ finnish ] = "Muunna mys tekstiasiakirjojen kentt ja taulukot"; +- Text[ italian ] = "Converti anche comadi di campo e tabelle nel documento di testo"; ++ Text[ italian ] = "Converti anche comandi di campo e tabelle nel documento di testo"; + Text[ danish ] = "Omregn ogs felter og tabeller i tekstdokumenter"; + Text[ swedish ] = "Konvertera ven fltkommandon och tabeller i textdokument"; + Text[ polish ] = "Konwertuj rwnie pola i tabele w dokumentach tekstowych"; +@@ -1558,7 +1558,7 @@ + Text[ dutch ] = "Beveiliging van werkbladen wordt hersteld..."; + Text[ french ] = "Restauration des protections des feuilles..."; + Text[ spanish ] = "Se volver a crear cada proteccin de tabla..."; +- Text[ italian ] = "Protezione tabella in corso di ripristinamento..."; ++ Text[ italian ] = "Protezione tabella in corso di ripristino..."; + Text[ danish ] = "Hver enkelt tabelbeskyttelse oprettes igen..."; + Text[ swedish ] = "Varje enskilt tabellskydd terstlls igen..."; + Text[ polish ] = "Zostanie przywrcona ochrona poszczeglnych arkuszy..."; +--- wizards/source/formwizard/dbwizres.src.lang39 2004-09-09 20:17:43.000000000 +0200 ++++ wizards/source/formwizard/dbwizres.src 2004-09-13 09:20:14.505836256 +0200 +@@ -401,7 +401,7 @@ + Text[ dutch ] = "Er is geen database genstalleerd. U heeft minstens n database nodig om de AutoPiloot voor formulieren te kunnen starten."; + Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de formulaire."; + Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el Piloto automtico para formularios."; +- Text[ italian ] = "Non stato installato nessun datase. Occorre almeno un database per poter avviare il Pilota automatico per i formulari."; ++ Text[ italian ] = "Non stato installato nessun database. Occorre almeno un database per poter avviare il Pilota automatico per i formulari."; + Text[ danish ] = "Der er ikke installeret nogen database. Mindst n database er ndvendig for at kunne starte AutoPilot til formularer."; + Text[ swedish ] = "Ingen databas r installerad. Du behver minst en databas fr att kunna starta AutoPiloten fr formulr."; + Text[ polish ] = "Nie zainstalowano adnej bazy danych. Do uruchomienia AutoPilota formularzy jest wymagana co najmniej jedna baza danych."; +--- wizards/source/importwizard/importwi.src.lang39 2004-09-09 20:18:01.000000000 +0200 ++++ wizards/source/importwizard/importwi.src 2004-09-13 09:20:14.512836396 +0200 +@@ -3164,7 +3164,7 @@ + Text[English] = "These will be exported in the following directory:"; + Text[ English_us ] = "These will be exported to the following directory:"; + Text[ french ] = "Ils seront exports vers le rpertoire suivant :"; +- Text[ italian ] = "L'esportazione avver nella seguente cartella:"; ++ Text[ italian ] = "L'esportazione avverr nella seguente cartella:"; + Text[ spanish ] = "Se exportarn al siguiente directorio:"; + Text[ portuguese ] = "Estes sero exportados para o seguinte directrio:"; + Text[ dutch ] = "Ze worden gexporteerd naar de volgende directory:"; +--- dbaccess/source/ui/dlg/indexdialog.src.orig 2004-09-24 11:54:26.719067593 +0200 ++++ dbaccess/source/ui/dlg/indexdialog.src 2004-09-24 11:54:39.276313464 +0200 +@@ -326,7 +326,7 @@ + Text[ dutch ] = "Huidig register opslaan"; + Text[ french ] = "Enregistrer l'index actif"; + Text[ spanish ] = "Guardar el ndice actual"; +- Text[ italian ] = "Salva l'indica attuale"; ++ Text[ italian ] = "Salva l'indice attuale"; + Text[ danish ] = "Gem aktuelt indeks"; + Text[ swedish ] = "Spara aktuellt index"; + Text[ polish ] = "Zapisz biecy indeks"; +--- extensions/source/installation/office/protchk/protdlg.src.orig 2004-09-24 12:06:44.595514043 +0200 ++++ extensions/source/installation/office/protchk/protdlg.src 2004-09-24 12:07:23.832283586 +0200 +@@ -578,7 +578,7 @@ + Text[ dutch ] = "Protocol voor gegevensoverdracht (FTP)"; + Text[ french ] = "Protocole de transfert de fichier (FTP)"; + Text[ spanish ] = "Protocolo para transferencia de archivo (FTP)"; +- Text[ italian ] = "Protocollo per tranfer di file (FTP)"; ++ Text[ italian ] = "Protocollo per la trasmissione di file (FTP)"; + Text[ danish ] = "Protokol for filoverfrsel (FTP)"; + Text[ swedish ] = "Protokoll fr filverfring (FTP)"; + Text[ polish ] = "Protok przesyania plikw (FTP)"; +--- extensions/source/propctrlr/formres.src.orig 2004-09-24 12:09:26.592696374 +0200 ++++ extensions/source/propctrlr/formres.src 2004-09-24 12:09:59.115335532 +0200 +@@ -2059,7 +2059,7 @@ + Text [ portuguese ] = "Espao vazio NULL" ; + Text [ english_us ] = "Empty string is NULL" ; + Text [ swedish ] = "Tom teckenstrng r NULL" ; +- Text [ italian ] = "Lo string vuoto ZERO" ; ++ Text [ italian ] = "Lo stringa vuota NULL" ; + Text [ spanish ] = "Serie de caracteres vaca es NULL" ; + Text [ french ] = "Espace vide gale NULL" ; + Text [ dutch ] = "Opvullen met NUL" ; +--- offmgr/source/offapp/dialog/treeopt.src.orig 2004-09-24 12:17:10.746815992 +0200 ++++ offmgr/source/offapp/dialog/treeopt.src 2004-09-24 12:17:23.009056856 +0200 +@@ -418,7 +418,7 @@ + < "Qui possibile effettuare le impostazioni per i documenti di presentazione che vengono salvati la prima volta. Tra l'altro possibile determinare i contenuti da visualizzare sulle pagine, l'unit di misura standard da adottare, l'allineamento alla griglia e i contenuti da stampare." ; SID_SD_EDITOPTIONS; > ; + < "Qui possibile effettuare diverse impostazioni per i disegni. Tra l'altro potete stabilire i contenuti da visualizzare sulle pagine, la scala standard da adottare, se e come allineare alla griglia e i contenuti da stampare." ; SID_SD_GRAPHIC_OPTIONS; > ; + < "Qui possibile selezionare il formato e le opzioni di stampa per tutte le formule salvate di recente. Queste opzioni risulteranno utili nel momento in cui volete stampare una formula direttamente da %PRODUCTNAME Math." ; SID_SM_EDITOPTIONS; > ; +- < "Qui possibile eseguire le installazioni fondamentali per %PRODUCTNAME Chart. Stabilite ie colori base per i nuovi diagrammi." ; SID_SCH_EDITOPTIONS; > ; ++ < "Qui possibile eseguire le installazioni fondamentali per %PRODUCTNAME Chart. Stabilite i colori base per i nuovi diagrammi." ; SID_SCH_EDITOPTIONS; > ; + < "Qui possibile eseguire le impostazioni per l'accesso a sorgenti dati esterne"; SID_SB_STARBASEOPTIONS; > ; + < "Qui possibile eseguire le installazioni fondamentali per caricare e salvare i documenti da formati esterni. Potete modificare le macro e gli oggetti OLE dei documenti MS Office oppure fare delle impostazioni per i documenti HTML." ; SID_FILTER_DLG; > ; + }; +--- padmin/source/padialog.src.typoita2 2004-09-24 12:42:29.686676409 +0200 ++++ padmin/source/padialog.src 2004-09-24 12:43:41.694095186 +0200 +@@ -3938,7 +3938,7 @@ + Text[ dutch ] = "Printer \"%s\" kan niet worden gemporteerd omdat deze geen geldige configuratie heeft."; \ + Text[ french ] = "L'imprimante \"%s\" n'a pas t correctement configure et ne peut donc pas tre importe."; \ + Text[ spanish ] = "La impresora \"%s\" no est correctamente configurada, por lo que no se puede importar."; \ +- Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non pu essere importata."; \ ++ Text[ italian ] = "La stampante \"%s\" ha una configurazione non valida e per questo non pu essere importata."; \ + Text[ danish ] = "Printeren \"%s\" har ingen gyldig konfiguration og kan derfor ikke importeres."; \ + Text[ swedish ] = "Det gr inte att importera skrivaren \"%s\" eftersom den inte r fullstndigt konfigurerad."; \ + Text[ polish ] = "Drukarki \"%s\" nie mona importowa, poniewa nie zostaa prawidowo skonfigurowana."; \ +--- readlicense_oo/docs/readme/readme.xrm.orig 2004-09-24 12:56:29.976222584 +0200 ++++ readlicense_oo/docs/readme/readme.xrm 2004-09-24 12:56:41.798455224 +0200 +@@ -2916,7 +2916,7 @@ + <Text id="dew32f" xml:lang="fr">Si l'activation du démarrage rapide d'OpenOffice.org devait causer des problèmes (lien non valide) au moment du démarrage du système, il est probable que l'unité réseau (sur laquelle l'installation en réseau correspondante est installée) n'est pas (ou pas encore) disponible.</Text> + <Text id="dew32f" xml:lang="es">Si durante el inicio del sistema se produjeran problemas al activar el inicio rápido de OpenOffice.org, p.ej. un vínculo no válido, esto puede ser debido a que la unidad de red en la que se instaló la instalación de red correspondiente aún no esté disponible o simplemente no esté disponible.</Text> + <Text id="dew32f" xml:lang="fi">Jos järjestelmää käynnistettäessä ilmenee ongelmia OpenOffice.orgn Pikakäynnistyksen avaamisessa (esim. virheellinen linkki), tämä johtuu mahdollisesti siitä, että verkkoasema, jolle verkkoasennus on tehty, ei ole vielä tai ollenkaan käytettävissä.</Text> +- <Text id="dew32f" xml:lang="it">Se durante l'avvio del sistema dovessero verificarsi dei problemi nell'aprire il QuickStart di OpenOffice.org (collegamento non valido) è dovuto al fatto che il driver di rete su cui è stata efffettuata l'installazione non è oppure non è ancora a disposizione.</Text> ++ <Text id="dew32f" xml:lang="it">Se durante l'avvio del sistema dovessero verificarsi dei problemi nell'aprire il QuickStart di OpenOffice.org (collegamento non valido) è dovuto al fatto che il driver di rete su cui è stata effettuata l'installazione non è oppure non è ancora a disposizione.</Text> + <Text id="dew32f" xml:lang="cs">Pokud se při startu systému objeví problémy s OpenOffice.org Quickstarterem (např. neplatný odkaz), může to být způsobeno, že v okamžiku spuštění síťové instalace není k dispozici síťový disk, na kterém se nachází síťová instalace.</Text> + <Text id="dew32f" xml:lang="sk">Pokiaľ sa pri štarte systému objavia problémy s OpenOffice.org Quickstar (napr. neplatný odkaz), môže to byť spôsobené tým, že v momente spustenia sieťovej inštalácie nie je k dispozícii sieťový disk, na ktorom sa nachádza sieťová inštalácia.</Text> + <Text id="dew32f" xml:lang="da">Hvis der under opstart af systemet opstår problemer med åbning af OpenOffice.org Hurtig start (f.eks. ugyldig genvej), skyldes dette sandsynligvis, at det netværksdrev, hvor den tilhørende netværksinstallation er installeret, ikke er tilgængelig.</Text> +--- readlicense_oo/docs/readme/readme.xrm.orig1 2004-09-24 13:04:31.374692638 +0200 ++++ readlicense_oo/docs/readme/readme.xrm 2004-09-24 12:56:41.000000000 +0200 +@@ -2958,7 +2958,7 @@ + <Text id="df3df" xml:lang="fr">La plupart du temps, ce type de cas se présente lorsque la connexion des unités réseau a lieu via un script de Login et que cette connexion a lieu en même temps que l'exécution des programmes du groupe Autostart, depuis lequel le démarrage rapide est également activé.</Text> + <Text id="df3df" xml:lang="es">En la mayoría de los casos esto se produce cuando el registro de la unidad de red se realiza mediante un Script de Login y la conexión de la unidad de red tiene lugar de manera paralela a la ejecución de los programas del grupo Inicio, desde el que también se inicia el inicio rápido.</Text> + <Text id="df3df" xml:lang="fi">Monesti näin tapahtuu, kun verkkoasemiin kirjaudutaan sisään kirjautumisskriptillä, ja yhteys verkkoasemiin otetaan samaan aikaan sellaisten ohjelmien suorittamisen kanssa, jotka ovat automaattikäynnistysryhmässä, josta myös Pikakäynnistys aloitetaan.</Text> +- <Text id="df3df" xml:lang="it">Nella maggior parte dei casi questo accade quando si effettua la registrazione del driver di rete tramite uno script di login e quindi il collegamento del driver di rete si realizza contemporanemente all'esecuzione del programma del gruppo di esecuzione automatica, da cui viene attivato QuickStart.</Text> ++ <Text id="df3df" xml:lang="it">Nella maggior parte dei casi questo accade quando si effettua la registrazione del driver di rete tramite uno script di login e quindi il collegamento del driver di rete si realizza contemporaneamente all'esecuzione del programma del gruppo di esecuzione automatica, da cui viene attivato QuickStart.</Text> + <Text id="df3df" xml:lang="cs">Ve většině případů toto nastane v okamžiku, když se síťový disk připojuje pomocí login skriptu, a tudíž se připojuje ve stejný okamžik jako skupina autostart, z níž se spouští Quickstarter.</Text> + <Text id="df3df" xml:lang="sk">Vo väčšine prípadov toto nastane v okamihu, keď sa sieťový disk pripája pomocou login skriptu, a zároveň sa pripája v tom istom momente ako skupina autostart, z ktorej sa spúšťa Quickstarter.</Text> + <Text id="df3df" xml:lang="da">I de fleste tilfælde sker dette, når der logges på netværksdrev ved hjælp af et logind-script, og forbindelsen til netværksdrevene etableres parallelt med eksekveringen af programmerne i autostartgruppen, hvorfra også Hurtig start åbnes.</Text> +@@ -3214,7 +3214,7 @@ + <Text id="naso2" xml:lang="fr">Si vous deviez rencontrer des problèmes au démarrage d'OpenOffice.org (la plupart du temps en relation avec Gnome), vous devez redéfinir la variable d'environnement SESSION_MANAGER dans le shell utilisé pour le démarrage d'OpenOffice.org : insérez "unset SESSION_MANAGER" au début du script shell de soffice placé dans le répertoire "[office folder]/program".</Text> + <Text id="naso2" xml:lang="es">Si surgen problemas durante la inicialización de OpenOffice.org (normalmente en conexión con Gnome) vuelva a definir la variable de entorno SESSION_MANAGER dentro de la cáscara (shell) que utiliza para iniciar OpenOffice.org. Esto se puede hacer añadiendo la línea "unset SESSION_MANAGER" al inicio del shell script de soffice que se encuentra en el directorio "[carperta office]/program".</Text> + <Text id="naso2" xml:lang="fi">If you experience OpenOffice.org startup problems (most notably while using Gnome) please 'unset' the SESSION_MANAGER environment variable inside the shell you use to start OpenOffice.org. This can be done by adding the line "unset SESSION_MANAGER" to the beginning of the soffice shell script found in the "[office folder]/program" directory.</Text> +- <Text id="naso2" xml:lang="it">Se si presentassero problemi all'avvio di OpenOffice.org (soprattutto sotto Gnome) è necessario ridefinire la varibile di ambiente SESSION_MANAGER nella shell che utilizzate per l'avvio di OpenOffice.org. A questo proposito digitate "unset SESSION_MANAGER" all'inizio dello script della shell che si trova nella cartella "[office folder]/program".</Text> ++ <Text id="naso2" xml:lang="it">Se si presentassero problemi all'avvio di OpenOffice.org (soprattutto sotto Gnome) è necessario ridefinire la variabile di ambiente SESSION_MANAGER nella shell che utilizzate per l'avvio di OpenOffice.org. A questo proposito digitate "unset SESSION_MANAGER" all'inizio dello script della shell che si trova nella cartella "[office folder]/program".</Text> + <Text id="naso2" xml:lang="cs">Pokud při startu OpenOffice.org pozorujete problémy (hlavně při používání Gnome), použijte v příkazovém interpretu, z něhož spouštíte OpenOffice.org, příkaz 'unset' ke zrušení proměnné prostředí SESSION_MANAGER. Můžete to zařídit přidáním řádku "unset SESSION_MANAGER" na začátek skriptu soffice, který se nachází v adresáři "[adresář OpenOffice.org]/program".</Text> + <Text id="naso2" xml:lang="sk">Pokiaľ pri štarte OpenOffice.org spozorujete problémy (hlavne pri používaní Gnome), použite v príkazovom interpreteri, z ktorého spúšťate OpenOffice.org, príkaz 'unset' pre zrušenie premennej prostredia SESSION_MANAGER. Môžete to zariadiť pridaním riadku "unset SESSION_MANAGER" na začiatok skriptu soffice, ktorý sa nachádza v adresári "[adresár OpenOffice.org]/program".</Text> + <Text id="naso2" xml:lang="da">Hvis du oplever opstartsproblemer (oftest i Gnome) skal du 'unset' miljøvariablen SESSION MANAGER i den skal, du bruger til at starte OpenOffice.org. Dette kan gøres ved at tilføje linjen "unset SESSION_MANAGER" i begyndelsen af soffice skalscriptet, som findes i kataloget "[office mappen]/program"</Text> +--- readlicense/docs/readme/readme.xrm~ 2004-09-24 13:25:17.252442851 +0200 ++++ readlicense/docs/readme/readme.xrm 2004-09-24 13:25:17.257442951 +0200 +@@ -4222,7 +4222,7 @@ + <Text id="scs2" xml:lang="fr">Le système de fichier ReiserFS (version inférieure à 3.6) cause des problèmes si l'ID d'utilisateur est supérieur à 65535 : les fichiers temporaires créés par OpenOffice.org ne peuvent plus être supprimés par le programme, mais uniquement par l'administrateur système (par ex. /tmp/OSL_PIPE_xxx ). Ceci a pour conséquence que OpenOffice.org ne démarre plus. Il s'agit là d'un problème du système de fichiers ReiserFS qui a toutefois disparu des versions 3.6 et plus.</Text> + <Text id="scs2" xml:lang="es">En versiones inferiores a la 3.6 el sistema de archivos ReiserFS puede ocasionar problemas si el ID del usuario es superior a 65535: los archivos temporales creados por OpenOffice.org ya no se podrán eliminar por el programa sino por el administrador del sistema (p.ej. /tmp/OSL_PIPE_xxx ). El resultado es que OpenOffice.org no se puede iniciar más. La situación aquí descrita es un problema del sistema de archivos ReiserFS que a partir de la versión 3.6 no se produce más.</Text> + <Text id="scs2" xml:lang="fi">Versiota 3.6 aikaisemmissa versioissa ReiserFS-tiedostojärjestelmä aiheuttaa ongelmia, jos käyttäjätunnus on pitempi kuin 65535. Ongelma on, että OpenOffice.orgn väliaikaisesti tallentamia tiedostoja ei voi poistaa ohjelmallisesti, vaan ainoastaan järjestelmän pääkäyttäjä voi tehdä sen (esim. /tmp/OSL_PIPE_xxx ). Sen vuoksi OpenOffice.orga ei voi käynnistää. Ongelma on ReiserFS-tiedostojärjestelmässä, ja se on korjattu versiossa 3.6 ja sitä uudemmissa versioissa.</Text> +- <Text id="scs2" xml:lang="it">Il sistema di file ReiserFS in una versione precedente alla 3.6 può causare dei problemi nei casi di un utente con un codice d'identificazione superiore a 65535 e cioè che i file temporanei creati da OpenOffice.org (ad esempio /tmp/OSL_PIPE_xxx ) non vengano eliminati dal programma stesso ma solo dall'amministratore del sistema. L'effetto seguente è che non sarà possibile avviare OpenOffice.org. La sistuazione sopra descritta è un problema noto del sistema di file ReiserF3 ed è stato risolto a partire dalla versione 3.6.</Text> ++ <Text id="scs2" xml:lang="it">Il sistema di file ReiserFS in una versione precedente alla 3.6 può causare dei problemi nei casi di un utente con un codice d'identificazione superiore a 65535 e cioè che i file temporanei creati da OpenOffice.org (ad esempio /tmp/OSL_PIPE_xxx ) non vengano eliminati dal programma stesso ma solo dall'amministratore del sistema. L'effetto seguente è che non sarà possibile avviare OpenOffice.org. La sistuazione sopra descritta è un problema noto del sistema di file ReiserFS ed è stato risolto a partire dalla versione 3.6.</Text> + <Text id="scs2" xml:lang="cs">V nižší verzi než 3.6 způsoboval ReiserFS problémy v okamžiku, kdy ID uživatele bylo vyšší než 65535. Problém byl ten, že dočasné soubory ukládané OpenOffice.org nemohly být již odstraněny, protože to mohl pouze správce systému (např. /tmp/OSL_PIPE_xxx). Výsledkem bylo, že nebylo možné spustit OpenOffice.org. Tento problém byl již ve verzi 3.6 a vyšší odstraněn.</Text> + <Text id="scs2" xml:lang="sk">V nižšej verzii ako 3.6 spôsoboval ReiserFS problémy v okamihu, keď ID užívateľa bolo vyššie ako 65535. Problém bol v tom, že dočasné súbory ukladané OpenOffice.org nemohli byť už odstránené, pretože to mohol len správca systému (napr. /tmp/OSL_PIPE_xxx). Výsledkom bolo, že nebolo možné spustiť OpenOffice.org. Tento problém bol už vo verzii 3.6 a vyššej odstránený.</Text> + <Text id="scs2" xml:lang="da">Filsystemet ReiserFS i versioner ældre end 3.6 giver problemer, når bruger-ID er større end 65535. Dette viser sig ved, at midlertidige filer oprettet af OpenOffice.org (f.eks. /tmp/OSL_PIPE_xxx ) ikke kan fjernes af programmet selv, men kun af systemadministratoren. Dette medfører, at OpenOffice.org ikke længere kan startes. Den beskrevne proces er et problem i filsystemet ReiserFS, og det er fjernet i version 3.6 og nyere.</Text> +--- readlicense_oo/docs/readme/readme.xrm.orig2 2004-09-24 16:21:23.052730248 +0200 ++++ readlicense_oo/docs/readme/readme.xrm 2004-09-24 16:21:43.317124601 +0200 +@@ -3708,7 +3708,7 @@ + <Text id="aw4333" xml:lang="fr">Le Java(TM) Access Bridge installé en même temps que cette version Early Access ne fonctionne éventuellement pas correctement avec les applications Java conventionnelles.</Text> + <Text id="aw4333" xml:lang="es">Puede suceder que el Java(TM) Access Bridge instalado con esta versión de early access no funcione correctamente con las aplicaciones de Java convencionales.</Text> + <Text id="aw4333" xml:lang="fi">The Java(TM) Access Bridge installed with this early access version does not work properly with conventional Java applications.</Text> +- <Text id="aw4333" xml:lang="it">Java (TM) Access Bridge, installato insieme a questa versione, non funziona correttamente con le normani applicazioni Java.</Text> ++ <Text id="aw4333" xml:lang="it">Java (TM) Access Bridge, installato insieme a questa versione, non funziona correttamente con le normali applicazioni Java.</Text> + <Text id="aw4333" xml:lang="cs">Java(TM) Access Bridge nainstalovaný se staršími verzemi nespolupracuje správně s běžnými Java aplikacemi.</Text> + <Text id="aw4333" xml:lang="sk">Java(TM) Access Bridge nainštalovaný so staršími verziami nespolupracuje správne s bežnými Java aplikáciami.</Text> + <Text id="aw4333" xml:lang="da">Udgaven af Java(TM) Access Bridge, som er installeret med denne tidlige version, virker ikke korrekt sammen med konventionelle Java-programmer</Text> +--- sc/source/ui/src/globstr.src.orig 2004-09-24 17:10:00.456316975 +0200 ++++ sc/source/ui/src/globstr.src 2004-09-24 17:10:10.729515783 +0200 +@@ -3477,7 +3477,7 @@ + Text [ portuguese_brazilian ] = "Desproteger documento" ; + Text [ swedish ] = "Upphv dokumentskydd" ; + Text [ danish ] = "Ophv dokumentbeskyttelse" ; +- Text [ italian ] = "Disattiva protezione documentro" ; ++ Text [ italian ] = "Disattiva protezione documento" ; + Text [ spanish ] = "Desproteger documento" ; + Text [ french ] = "Annuler la protection de document" ; + Text [ dutch ] = "Beveiliging opheffen" ; +--- sc/source/ui/src/scfuncs.src.orig2 2004-09-24 17:18:10.624794633 +0200 ++++ sc/source/ui/src/scfuncs.src 2004-09-24 17:18:23.431041899 +0200 +@@ -12628,7 +12628,7 @@ + Text = "Flligkeit. F = 1 heit Flligkeit am Anfang einer Periode, F = 0 am Ende." ; + Text [ english ] = "???" ; + Text [ norwegian ] = "Type=1 viser fortjenesten ved periodens begynnelse, =0 ved periodens slutt." ; +- Text [ italian ] = "Tipo di scadenze dei pagamaenti. 1 = all'inizio del periodo, 0 = alla fine." ; ++ Text [ italian ] = "Tipo di scadenze dei pagamenti. 1 = all'inizio del periodo, 0 = alla fine." ; + Text [ portuguese_brazilian ] = "Tipo = 1 denota a dvida no incio do perodo, = 0 no fim." ; + Text [ portuguese ] = " o vencimento dos pagamentos de juros. 1 significa no nicio do perodo, 0 no final." ; + Text [ finnish ] = "Tyyppi 1 tarkoittaa kauden alkua ja 0 kauden loppua." ; +--- sc/source/ui/src/scfuncs.src.orig3 2004-09-24 17:43:29.216140105 +0200 ++++ sc/source/ui/src/scfuncs.src 2004-09-24 17:44:17.603075732 +0200 +@@ -15233,7 +15233,7 @@ + Text = "Berechnet die jhrliche Effektivverzinsung zu einer Nominalverzinsung." ; + Text [ english ] = "???" ; + Text [ norwegian ] = "Beregner rlig effektiv rente ut fra den nominelle renten." ; +- Text [ italian ] = "Restituisce l'interesse effettivo annuale per un'interesse nominale." ; ++ Text [ italian ] = "Restituisce l'interesse effettivo annuale per un interesse nominale." ; + Text [ portuguese_brazilian ] = "Calcula a taxa de juros anual lquida para uma taxa de juros nominal." ; + Text [ portuguese ] = "Calcula a taxa de juros anual efectiva para uma taxa de juros nominal." ; + Text [ finnish ] = "Laskee nimellisen koron vuosittaisen nettosumman." ; +--- sc/source/ui/src/scfuncs.src.orig4 2004-09-24 17:49:47.910463038 +0200 ++++ sc/source/ui/src/scfuncs.src 2004-09-24 17:50:03.836770284 +0200 +@@ -31790,7 +31790,7 @@ + Text = "Erste Matrix, deren Argumente quadriert summiert werden." ; + Text [ english ] = "is the first array or range of values." ; + Text [ norwegian ] = "Den frste matrisen der kvadratet av argumentene skal legges sammen." ; +- Text [ italian ] = "Prima matrice di cui si deve aggiundere l'elemento al quadrato." ; ++ Text [ italian ] = "Prima matrice di cui si deve aggiungere l'elemento al quadrato." ; + Text [ portuguese_brazilian ] = "Primeiro vetor no qual o quadrado dos argumentos totalizado." ; + Text [ portuguese ] = " a primeira matriz ou intervalo de valores." ; + Text [ finnish ] = "Ensimminen taulukko, jonka argumenttien nelit lasketaan yhteen." ; +--- scaddins/source/analysis/analysis.src.orig 2004-09-24 18:06:22.021667020 +0200 ++++ scaddins/source/analysis/analysis.src 2004-09-24 18:07:12.741638289 +0200 +@@ -19010,7 +19010,7 @@ + Text[ french ] = "Renvoie la dure de Macaulay modifie d'un titre pour une valeur nominale de 100 units montaires."; + Text[ spanish ] = "Devuelve la duracin modificada de Macaulay de un ttulo de un valor de 100 unidades monetarias."; + Text[ finnish ] = "Palauttaa arvopaperin Macaulay-keston oletetulla 100 valuuttayksikn nimellisarvolla"; +- Text[ italian ] = "Restituisce la durata Macauley modificata di un titolo con un valore nominale di 100 unit monetarie."; ++ Text[ italian ] = "Restituisce la durata Macaulay modificata di un titolo con un valore nominale di 100 unit monetarie."; + Text[ danish ] = "Returnerer den modificerede Macauley-varighed for et vrdipapir med 100 valutaenheder plydende vrdi."; + Text[ swedish ] = "Returnerar den modifierade Macauley-lptiden fr ett vrdepapper med ett nominellt vrde p 100 valutaenheter."; + Text[ polish ] = "Zwraca warto zmodyfikowanego okresu Macaulay'a w przypadku papieru wartociowego o zaoonej wartoci 100 jednostek."; +--- scp/source/fonts/module_fonts.lng.orig 2004-09-24 11:37:51.000000000 +0200 ++++ scp/source/fonts/module_fonts.lng 2004-09-24 18:16:06.912895565 +0200 +@@ -51,7 +51,7 @@ + 33 = "Ce module permet d'largir le choix des polices de caractres. Ces polices supplmentaires sont galement disponibles dans les modles et exemples de document." + 34 = "Seleccione este mdulo para incluir fuentes adicionales y as ampliar la gama de diseos. Estas fuentes se utilizan tambin en las plantillas y ejemplos. " + 35 = "Lisfontit" +-39 = "Selezionate questo modulo per aggiungere altri tipi di caratere per aumentarne la gamma a disposizione. Questi caratteri sono utilizzati anche da modelli ed esempi." ++39 = "Selezionate questo modulo per aggiungere altri tipi di carattere per aumentarne la gamma a disposizione. Questi caratteri sono utilizzati anche da modelli ed esempi." + 45 = "Yderligere skrifttyper." + 46 = "Vlj den hr modulen om du vill ha ytterligare teckensnitt fr mer designflexibilitet. De hr teckensnitten anvnds ven i mallarna och exemplen." + 48 = "Dodatkowe czcionki." +--- scp/source/office/setuphelp.lng.orig 2004-09-24 18:23:35.062535707 +0200 ++++ scp/source/office/setuphelp.lng 2004-09-24 18:23:58.511988475 +0200 +@@ -99,7 +99,7 @@ + 33 = "Une installation de station de travail n'installe que les fichiers utilisateur requis pour le fonctionnement de %PRODUCTNAME depuis une installation serveur.\n\nUne installation locale installe tous les fichiers requis pour l'excution de %PRODUCTNAME sur l'ordinateur." + 34 = "Una instalacin de estacin de trabajo slo instala los archivos especficos del usuario necesarios para ejecutar %PRODUCTNAME despus de una instalacin de servidor.\n\nUna instalacin local instala todos los archivos necesarios para ejecutar %PRODUCTNAME en su ordenador." + 35 = "A workstation installation only installs user-specific files that are required to run %PRODUCTNAME from a server installation.\n\nA local installation installs all of the files that are required to run %PRODUCTNAME from your computer." +-39 = "L'installazione per workstation installa solo quei file speciifci dell'utente necessari per il funzionamento di %PRODUCTNAME su un server.\n\nUn'installazione locale installa tutti i file necessari per il funzionamento di %PRODUCTNAME sul computer." ++39 = "L'installazione per workstation installa solo quei file specifici dell'utente necessari per il funzionamento di %PRODUCTNAME su un server.\n\nUn'installazione locale installa tutti i file necessari per il funzionamento di %PRODUCTNAME sul computer." + 45 = "En arbejdsstationsinstallation installerer kun de ndvendige brugerspecifikke filer fra en serverinstallation. En enkeltbrugerinstallation installerer alle ndvendige filer, s %PRODUCTNAME kan kres direkte p din computer." + 46 = "En installation p en arbetsstation installerar bara anvndarspecifika filer som krvs fr att %PRODUCTNAME ska kunna kras frn en serverinstallation.\n\nEn lokal installation installerar alla filer som krvs fr att %PRODUCTNAME ska kunna kras frn din dator." + 48 = "A workstation installation only installs user-specific files that are required to run %PRODUCTNAME from a server installation.\n\nA local installation installs all of the files that are required to run %PRODUCTNAME from your computer." +--- setup2/source/custom/reg4msdoc/preg4msdoc.src.orig 2004-09-24 18:33:41.284269065 +0200 ++++ setup2/source/custom/reg4msdoc/preg4msdoc.src 2004-09-24 18:33:51.474467256 +0200 +@@ -646,7 +646,7 @@ + Text[ french ] = "Vous pouvez utiliser %PRODUCTNAME %PRODUCTVERSION comme application par dfaut pour l'ouverture et l'dition des documents Microsoft Word, Excel et PowerPoint.\nSi vous n'en avez pas l'intention, supprimez le marquage des options.\nVous pouvez de plus dfinir %PRODUCTNAME %PRODUCTVERSION comme diteur HTML par dfaut.\nEn cas contraire, supprimez le marquage de l'option '%PRODUCTNAME %PRODUCTVERSION Writer/Web'."; + Text[ spanish ] = "Puede utilizar %PRODUCTNAME %PRODUCTVERSION como una aplicacin predeterminada para la apertura y edicin de los archivos de Microsoft Word, Excel y PowerPoint files.\nSi esta no es su intencin anule la seleccin de las opciones.\nAdems podr registrar %PRODUCTNAME %PRODUCTVERSION como editor HTML predeterminado.\nSi sta tampoco es su intencin borre la marca de la opcin '%PRODUCTNAME %PRODUCTVERSION Writer/Web'."; + Text[ finnish ] = "Voit kytt %PRODUCTNAME %PRODUCTVERSION -ohjelmaa oletussovelluksena Microsoft Word-, Excel- ja PowerPoint-asiakirjojen avaamiseen ja muokkaamiseen.\nEllet halua tehd niin, poista valintamerkki.\nVoit mys rekisterid %PRODUCTNAME %PRODUCTVERSION -ohjelman jrjestelmsi HTML-oletuseditoriksi.\nEllet halua rekisterid %PRODUCTNAME %PRODUCTVERSION -ohjelmaa, poista valintamerkki kohdasta %PRODUCTNAME %PRODUCTVERSION Writer/Web'."; +- Text[ italian ] = "Potete utilizzare %PRODUCTNAME %PRODUCTVERSION quale applicazione standard per aprire documenti Microsoft Word, Excel e PowerPoint.\nSe preferite non usare il programma quale applicazione standard eliminate il contrassegno dall'opzione.\nPotete impostare %PRODUCTNAME %PRODUCTVERSION quale editor standard HTML\nIn caso contrario eliminate il contrassego dall'opzione '%PRODUCTNAME %PRODUCTVERSION Writer/Web'."; ++ Text[ italian ] = "Potete utilizzare %PRODUCTNAME %PRODUCTVERSION quale applicazione standard per aprire documenti Microsoft Word, Excel e PowerPoint.\nSe preferite non usare il programma quale applicazione standard eliminate il contrassegno dall'opzione.\nPotete impostare %PRODUCTNAME %PRODUCTVERSION quale editor standard HTML\nIn caso contrario eliminate il contrassegno dall'opzione '%PRODUCTNAME %PRODUCTVERSION Writer/Web'."; + Text[ danish ] = "Du kan bruge %PRODUCTNAME %PRODUCTVERSION som standardprogram til at bne og redigere Microsoft Word-, Microsoft Excel- og Microsoft PowerPoint-dokumenter.\nHvis du ikke nsker dette, skal du fjerne markeringen.\nDu kan ogs vlge, om %PRODUCTNAME %PRODUCTVERSION skal defineres som standard-HTML-editor p computeren. Hvis du ikke nsker at anvende %PRODUCTNAME %PRODUCTVERSION som standard-HTML-editor p computeren, skal du fjerne markeringen af '%PRODUCTNAME %PRODUCTVERSION Writer/Web'."; + Text[ swedish ] = "Du kan anvnda %PRODUCTNAME %PRODUCTVERSION som standardprogram fr att ppna och redigera Microsoft Word-, Excel- och PowerPoint-dokument.\nOm du inte vill det tar du bort markeringen.\nDessutom kan du definiera om %PRODUCTNAME %PRODUCTVERSION ska stllas in som standard-HTML-redigerare i ditt system.\nOm du inte vill anvnda %PRODUCTNAME %PRODUCTVERSION som standard-HTML-redigerare i ditt system avmarkerar du '%PRODUCTNAME %PRODUCTVERSION Writer/Web'."; + Text[ polish ] = "Moesz uywa programw %PRODUCTNAME %PRODUCTVERSION jako domylnych aplikacji do otwierania i edytowania plikw w formacie Microsoft Word, Excel i PowerPoint files.\nJeli tego nie chcesz, wyczy pole wyboru.\nMoesz take zarejestrowa %PRODUCTNAME %PRODUCTVERSION jako domylny edytor HTML.\nJeli nie chcesz rejestrowa %PRODUCTNAME %PRODUCTVERSION jako domylnego edytora HTML, wyczy pole wyboru %PRODUCTNAME %PRODUCTVERSION Writer/Web."; +--- sw/source/ui/app/app.src.orig 2004-09-24 18:37:04.577223727 +0200 ++++ sw/source/ui/app/app.src 2004-09-24 18:37:13.204391591 +0200 +@@ -4190,7 +4190,7 @@ + Message = "Zum Fortsetzen des Vorgangs, muss die Rckgngig-Funktion abgeschaltet werden. Wollen Sie die Rckgngig-Funktion abschalten?"; + Message [ English ] = "This action needs for undo many memory.\nWould you disable undo?" ; + Message [ norwegian ] = "Du m sl av angrefunksjonen for fortsette med denne handlingen. Vil du sl av angrefunksjonen?" ; +- Message [ italian ] = "Per procedre con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilit di annullare?" ; ++ Message [ italian ] = "Per procedere con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilit di annullare?" ; + Message [ portuguese_brazilian ] = "Para prosseguir com esta ao, voc deve primeiro desativar a funo \"desfazer\".\nDeseja desativar a funo \"desfazer\"?" ; + Message [ portuguese ] = "Para poder anular esta aco necessria muita memria.\nDeseja cancelar esta funo?" ; + Message [ finnish ] = "Tmn toiminnon kumoamiseen tarvitaan suuri mr muistia.\nHaluatko peruuttaa kumoamisen?" ; +--- sw/source/ui/docvw/docvw.src.orig 2004-09-24 18:38:34.654976561 +0200 ++++ sw/source/ui/docvw/docvw.src 2004-09-24 18:38:45.857194567 +0200 +@@ -1742,7 +1742,7 @@ + Text [ portuguese_brazilian ] = "Formatado" ; + Text [ swedish ] = "Attributerat" ; + Text [ danish ] = "Formateret" ; +- Text [ italian ] = "Fomattato" ; ++ Text [ italian ] = "Formattato" ; + Text [ spanish ] = "Formateado" ; + Text [ french ] = "Format" ; + Text [ dutch ] = "Opgemaakt" ; +--- sw/source/ui/misc/glosbib.src.orig 2004-09-24 18:40:01.197660882 +0200 ++++ sw/source/ui/misc/glosbib.src 2004-09-24 18:40:11.363858757 +0200 +@@ -316,7 +316,7 @@ + Text[ french ] = "Chemin"; + Text[ spanish ] = "Ruta"; + Text[ finnish ] = "Polku"; +- Text[ italian ] = "Percoso"; ++ Text[ italian ] = "Percorso"; + Text[ danish ] = "Sti"; + Text[ swedish ] = "Skvg"; + Text[ polish ] = "cieka"; +--- scp/source/office/basic.lng.orig 2004-09-24 11:37:52.000000000 +0200 ++++ scp/source/office/basic.lng 2004-09-25 09:35:36.216182919 +0200 +@@ -179,7 +179,7 @@ + 33 = "%PRODUCTNAME n'a malheureusement pas russi dtecter les fichiers destins l'installation de la base de donnes Adabas. Si vous souhaitez utiliser l'intgration d'Adabas sous %PRODUCTNAME, lancez manuellement le programme d'installation d'Adabas, une fois l'installation de %PRODUCTNAME termine. Le jeu d'installation d'Adabas peut tre tlcharg partir de l'Internet." + 34 = "%PRODUCTNAME no pudo encontrar los archivos para la instalacin de la base de datos Adabas. Si desea usar la integracin de Adabas en %PRODUCTNAME, inicie 'manualmente' el programa de instalacin de Adabas despus de instalar %PRODUCTNAME. El programa de instalacin de Adabas lo puede descargar desde Internet." + 35 = "%PRODUCTNAME ei lytnyt Adabas-tietokannan asennuksessa tarvittavia tiedostoja. Jos haluat integroida Adabas-tietokannan %PRODUCTNAMEen, suorita Adabas-asennusohjelma %PRODUCTNAMEn asennuksen jlkeen. Adabas-asennusohjelma voidaan ladata Internetist." +-39 = "Non stato possibile trovare i file per l'istallazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet." ++39 = "Non stato possibile trovare i file per l'installazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet." + 45 = "%PRODUCTNAME kunne desvrre ikke finde filerne til installation af Adabas-databasen. Hvis du nsker at bruge Adabas-integration i %PRODUCTNAME, skal du starte installationsprogrammet til Adabas manuelt efter installation af %PRODUCTNAME. Adabas-installationsfilerne kan hentes p Internet." + 46 = "Tyvrr kunde %PRODUCTNAME inte hitta filerna fr installation av Adabas-databasen. Om du vill anvnda Adabas-integrationen i %PRODUCTNAME, startar du setupprogrammet fr Adabas manuellt nr installationen av %PRODUCTNAME r avslutad. Adabas-installationsfilerna kan laddas ner frn Internet." + 48 = "Program %PRODUCTNAME nie znalaz plikw potrzebnych do zainstalowania bazy danych Adabas. Jeeli chcesz zintegrowa baz danych Adabas z programem %PRODUCTNAME, to uruchom jej program instalacyjny po zakoczeniu instalacji %PRODUCTNAME. Pliki instalacyjne bazy danych Adabas mona pobra z Internetu." +--- scp/source/office/unxbasic.lng.orig 2004-09-25 09:36:48.023647109 +0200 ++++ scp/source/office/unxbasic.lng 2004-09-25 09:37:03.035953143 +0200 +@@ -93,7 +93,7 @@ + 33 = "%PRODUCTNAME n'a malheureusement pas russi dtecter les fichiers destins l'installation de la base de donnes Adabas. Si vous souhaitez utiliser l'intgration d'Adabas sous %PRODUCTNAME, lancez manuellement le programme d'installation d'Adabas, une fois l'installation de %PRODUCTNAME termine. Le jeu d'installation d'Adabas peut tre tlcharg partir de l'Internet." + 34 = "%PRODUCTNAME no pudo encontrar los archivos para la instalacin de la base de datos Adabas. Si desea usar la integracin de Adabas en %PRODUCTNAME, inicie 'manualmente' el programa de instalacin de Adabas despus de instalar %PRODUCTNAME. El programa de instalacin de Adabas lo puede descargar desde Internet." + 35 = "%PRODUCTNAME ei lytnyt Adabas-tietokannan asennuksessa tarvittavia tiedostoja. Jos haluat integroida Adabas-tietokannan %PRODUCTNAMEen, suorita Adabas-asennusohjelma %PRODUCTNAMEn asennuksen jlkeen. Adabas-asennusohjelma voidaan ladata Internetist." +-39 = "Non stato possibile trovare i file per l'istallazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet." ++39 = "Non stato possibile trovare i file per l'installazione del database Adabas. Se volete usare l'integrazione Adabas in %PRODUCTNAME avviate il setup di Adabas manualmente dopo aver installato %PRODUCTNAME. I file d'installazione di Adabas possono essere scaricati da Internet." + 45 = "%PRODUCTNAME kunne desvrre ikke finde filerne til installation af Adabas-databasen. Hvis du nsker at bruge Adabas-integration i %PRODUCTNAME, skal du starte installationsprogrammet til Adabas manuelt efter installation af %PRODUCTNAME. Adabas-installationsfilerne kan hentes p Internet." + 46 = "Tyvrr kunde %PRODUCTNAME inte hitta filerna fr installation av Adabas-databasen. Om du vill anvnda Adabas-integrationen i %PRODUCTNAME, startar du setupprogrammet fr Adabas manuellt nr installationen av %PRODUCTNAME r avslutad. Adabas-installationfilerna kan laddas ner frn Internet." + 48 = "Program %PRODUCTNAME nie znalaz plikw potrzebnych do zainstalowania bazy danych Adabas. Jeeli chcesz zintegrowa baz danych Adabas z programem %PRODUCTNAME, to uruchom jej program instalacyjny po zakoczeniu instalacji %PRODUCTNAME. Pliki instalacyjne bazy danych Adabas mona pobra z Internetu." +--- setup2/source/ui/pages/vefun.src.orig 2004-09-25 09:38:07.692270887 +0200 ++++ setup2/source/ui/pages/vefun.src 2004-09-25 09:38:21.625554800 +0200 +@@ -642,7 +642,7 @@ + Text [ portuguese_brazilian ] = "Para reiniciar agora, clique em '%1'. Utilize '%2' para concluir o programa de instalao." ; + Text [ swedish ] = "Fr att gra en omstart klicka p '%1'. Klickar du dremot p '%2', kommer installationsprogrammet att avslutas." ; + Text [ danish ] = "Klik p '%1' for at genstarte. Hvis du klikker p '%2' afsluttes installationsprogrammet derimod." ; +- Text [ italian ] = "Per effettuare adesso un riavvio, cliccate su '%1'. Cliccando invece su '%2', il programma di installazione verr conlcuso." ; ++ Text [ italian ] = "Per effettuare adesso un riavvio, cliccate su '%1'. Cliccando invece su '%2', il programma di installazione verr concluso." ; + Text [ spanish ] = "Pulse sobre '%1' para reiniciar el sistema. Pulse '%2' para terminar el programa de instalacin." ; + Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; + Text [ dutch ] = "Klik op '%1' om het systeem opnieuw op te starten. Klikt u echter op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; +--- sc/source/ui/src/scfuncs.src.orig5 2004-09-25 09:39:33.508019211 +0200 ++++ sc/source/ui/src/scfuncs.src 2004-09-25 09:40:17.395913054 +0200 +@@ -10997,7 +10997,7 @@ + Text = "Periode. Die Periode, fr die die Tilgung berechnet wird. P = 1 heit fr die erste Periode, P = ZZR fr die letzte." ; + Text [ english ] = "specifies the period and must be in the range 1 to nper." ; + Text [ norwegian ] = "Periode. Perioden avdragene beregnes for. Per=1 gir frste periode, P=PERIODER gir siste periode." ; +- Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento . 1 = primo periodo, Numero rate = ultimo periodo." ; ++ Text [ italian ] = "La durata per la quale si desidera calcolare l'ammortamento. 1 = primo periodo, Numero rate = ultimo periodo." ; + Text [ portuguese_brazilian ] = "Perodo. O perodo para o qual os reembolsos so calculados. Per = 1 denota o primeiro perodo, P = NPER para o ltimo" ; + Text [ portuguese ] = " o perodo para o qual se calcula a amortizao. 1 indica o primeiro perodo, nper o ltimo." ; + Text [ finnish ] = "Kausi Kausi, jonka maksut lasketaan. P = 1 tarkoittaa ensimmist ja P = NPER viimeist kautta" ; +--- setup2/source/ui/pages/preadygo.src.orig 2004-09-24 11:38:02.000000000 +0200 ++++ setup2/source/ui/pages/preadygo.src 2004-09-25 09:42:06.521134806 +0200 +@@ -319,7 +319,7 @@ + Text[ french ] = "L'espace disponible sur l'unit cible ne suffit pas pour l'installation de %PRODUCTPATCHNAME. L'installation requiert environ %SPACE_NEEDED Ko de plus."; + Text[ spanish ] = "La unidad de destino no dispone de espacio suficiente para instalar %PRODUCTPATCHNAME. Se requieren unos %SPACE_NEEDED KB ms."; + Text[ finnish ] = "Kohdeasemalla ei ole tarpeeksi tilaa kohteen %PRODUCTPATCHNAME asentamiseen. Listilaa tarvitaan noin %SPACE_NEEDED kt."; +- Text[ italian ] = "Il drive di destinazione non ha lo spazio suffciente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB."; ++ Text[ italian ] = "Il drive di destinazione non ha lo spazio sufficiente per installare %PRODUCTPATCHNAME. Per l'installazione sono necessari ancora %SPACE_NEEDED KB."; + Text[ danish ] = "Der er ikke tilstrkkelig ledig plads p destinationsdrevet til at installere %PRODUCTPATCHNAME. Der krves ca. %SPACE_NEEDED KB yderligere."; + Text[ swedish ] = "Det finns inte tillrckligt med utrymme p mlenheten fr att %PRODUCTPATCHNAME ska kunna installeras. Det behvs ungefr %SPACE_NEEDED KB ytterligare."; + Text[ polish ] = "Za mao miejsca na dysku docelowym, aby zainstalowa aktualizacj %PRODUCTPATCHNAME. Potrzeba jeszcze okoo %SPACE_NEEDED KB."; +--- svx/source/dialog/page.src.orig 2004-09-25 09:45:15.537980791 +0200 ++++ svx/source/dialog/page.src 2004-09-25 10:01:44.441194427 +0200 +@@ -4014,7 +4014,7 @@ + < "C6" ; PAPERSIZE_C6 ; > ; + < "C65" ; PAPERSIZE_C65 ; > ; + < "DL" ; PAPERSIZE_DL ; > ; +- < "Diapoisitiva" ; PAPERSIZE_DIA ; > ; ++ < "Diapositiva" ; PAPERSIZE_DIA ; > ; + < "Schermo" ; PAPERSIZE_SCREEN ; > ; + < "16 kai" ; PAPERSIZE_KAI16; > ; + < "32 kai" ; PAPERSIZE_KAI32; > ; +--- sc/idl/scalc.idl.orig 2000-09-18 18:44:47.000000000 +0200 ++++ sc/idl/scalc.idl 2004-09-25 10:07:29.607258546 +0200 +@@ -5389,7 +5389,7 @@ + //idlpp HelpText [ french ] = "Modifier les prdfinitions de format d'une ou plusieurs cellules" ; + //idlpp ConfigName [ spanish ] = "Formatear celda" ; + //idlpp HelpText [ spanish ] = "Editar formatos predeterminados para una o ms celdas" ; +- //idlpp ConfigName [ italian ] = "Fromatta cella" ; ++ //idlpp ConfigName [ italian ] = "Formatta cella" ; + //idlpp HelpText [ italian ] = "Modifica le preimpostazioni per un o pi celle" ; + //idlpp ConfigName [ danish ] = "FormatCell" ; + //idlpp HelpText [ danish ] = "Redigr typografi for en eller flere celler" ; +--- sc/sdi/scslots.src.orig 2004-09-24 11:37:31.000000000 +0200 ++++ sc/sdi/scslots.src 2004-09-25 10:08:34.683588109 +0200 +@@ -258,7 +258,7 @@ + SlotName[ dutch ] = "Cel opmaken"; + SlotName[ french ] = "Formater la cellule"; + SlotName[ spanish ] = "Formatear celda"; +- SlotName[ italian ] = "Fromatta cella"; ++ SlotName[ italian ] = "Formatta cella"; + SlotName[ danish ] = "Formater celle"; + SlotName[ swedish ] = "Formatera cell"; + SlotName[ polish ] = "Formatuj komrk"; +--- svx/source/dialog/sdstring.src.orig 2004-09-25 10:10:16.930675873 +0200 ++++ svx/source/dialog/sdstring.src 2004-09-25 10:10:32.883001471 +0200 +@@ -582,7 +582,7 @@ + Text = "Die Bitmap wurde gendert und nicht gesichert. \nSie knnen die selektierte Bitmap ndern \noder eine neue Bitmap hinzufgen." ; + Text [ ENGLISH ] = "The Bitmap was modified without Save? \nChange the selected Bitmap or add a new Bitmap." ; + Text [ norwegian ] = "Bildet ble endret, men ikke lagret. \nEndre det valgte bildet, eller legg til et nytt." ; +- Text [ italian ] = "La bitmap stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no naggiungerne una nuova." ; ++ Text [ italian ] = "La bitmap stata modificata ma non salvata \nPotete cambiare la bitmap selezionata \no aggiungerne una nuova." ; + Text [ portuguese_brazilian ] = "O bitmap foi modificado sem salvar. \nModifique o bitmap selecionado ou adicione um novo bitmap." ; + Text [ portuguese ] = "O bitmap foi alterado e no guardado? \nPoder modificar o bitmap seleccionado \nou adicionar um novo." ; + Text [ finnish ] = "Bittikarttaa ei tallennettu muutoksen jlkeen. \nMuuta valittua bittikarttaa tai lis uusi bittikartta." ; +--- svx/source/dialog/sdstring.src.orig2 2004-09-25 10:10:32.883001000 +0200 ++++ svx/source/dialog/sdstring.src 2004-09-25 10:11:54.267662092 +0200 +@@ -815,7 +815,7 @@ + Text = "Der Linienstil wurde gendert und nicht gesichert. \nSie knnen den selektierten Linienstil ndern \noder einen neuen Linienstil hinzufgen." ; + Text [ ENGLISH ] = "The Linestyle was modified without Save? \nChange the selected Linestyle or add a new Linestyle." ; + Text [ norwegian ] = "Linjestilen ble endret, men ikke lagret. \nEndre den valgte linjestilen eller legg til en ny." ; +- Text [ italian ] = "Lo stile stato modificato ma non salvato.\nPotetecambiare lo stile selezionato\\o aggiungerne uno nuovo." ; ++ Text [ italian ] = "Lo stile stato modificato ma non salvato.\nPotete cambiare lo stile selezionato\\o aggiungerne uno nuovo." ; + Text [ portuguese_brazilian ] = "O estilo de linha foi modificado sem salvar. \nModifique o estilo de linha selecionado ou adicione um novo estilo de linha." ; + Text [ portuguese ] = "O fim de linha foi modificado e no guardado.\nPoder modificar o fim de linha seleccionado\nou adicionar um novo." ; + Text [ finnish ] = "Viivatyyli ei tallennettu muutoksen jlkeen. \nMuuta valittua viivatyyli tai lis uusi viivatyyli." ; +--- svx/source/items/svxerr.src.orig2 2004-09-25 10:14:17.880590564 +0200 ++++ svx/source/items/svxerr.src 2004-09-25 10:16:46.979628616 +0200 +@@ -801,7 +801,7 @@ + Text[ swedish ] = "Formulrskiktet laddades inte eftersom ndvndig IO-service (stardiv.uno.io.*) inte kunde instantieras."; + Text[ language_user1 ] = "Plast obrazca se ni naložila, ker zahtevanih IO-storitev (stardiv.uno.io*) ni bilo mogoče uporabiti"; + Text[ russian ] = " , IO (stardiv.uno.io.*)."; +- Text[ italian ] = "Lo strato del formulario non stato caricato poich stato possibile creare i servizi IO (strdiv.uno.io.*) necessari."; ++ Text[ italian ] = "Lo strato del formulario non stato caricato poich non stato possibile creare i servizi IO (strdiv.uno.io.*) necessari."; + Text[ danish ] = "Formularlaget blev ikke indlst, fordi det ikke var muligt at instantiere den ndvendige IO-service (stardiv.uno.io.*)"; + Text[ polish ] = "Warstwa formularza nie zostaa zaadowana, poniewa nie mona utworzy instancji wymaganych usug we-wy (stardiv.uno.io.*)"; + Text[ portuguese_brazilian ] = "A camada do formulrio no foi carregada, pois no foi possvel criar uma instncia dos servios de ES necessrios (stardiv.uno.io.*)"; +--- readlicense_oo/docs/readme/readme.xrm.orig6 2004-09-25 10:23:19.245633102 +0200 ++++ readlicense_oo/docs/readme/readme.xrm 2004-09-25 10:23:51.604295424 +0200 +@@ -3668,7 +3668,7 @@ + <Text id="aw453" xml:lang="fr">En raison d'un problème rencontré dans le Java(TM) Access Bridge, vous devez définir "Anglais (États-Unis)" (ou "EN-us") comme langue (environnement linguistique) du système d'exploitation, ceci afin d'activer la coopération avec des logiciels tels que ZoomText.(Attention ! Le programme WindowEyes ne fonctionne pas avec OpenOffice.org étant donné qu'il ne supporte pas la Java Accessibility API.)</Text> + <Text id="aw453" xml:lang="es">Debido a un problema con Java(TM) Access Bridge, deberá establecer el idioma del sistema operativo local en "Inglés (Reino Unido)" o "(EN-US)". Sólo con esta configuración podrá trabajar con programas como ZoomText.</Text> + <Text id="aw453" xml:lang="fi">Due to a problem within the Java(TM) Accessibility Bride it is necessary to set the operating system locale to "English (United States)". Only this setting will enable co-operation with programs like ZoomText.</Text> +- <Text id="aw453" xml:lang="it">Dovuto a un problema di Java (TM) Access Bridge è necessario impostare la lingua del sistema operativo locale su "Inglese (USA)" ("EN-US"). In questo modo sarà possibile lavorare con programmi del tipo ZoomText. (Nota: il programma WindowEyes non funziona con OpenOffice.org perchè non supporta l'API Java Accessibility).</Text> ++ <Text id="aw453" xml:lang="it">Dovuto a un problema di Java (TM) Access Bridge è necessario impostare la lingua del sistema operativo locale su "Inglese (USA)" ("EN-US"). In questo modo sarà possibile lavorare con programmi del tipo ZoomText. (Nota: il programma WindowEyes non funziona con OpenOffice.org perché non supporta l'API Java Accessibility).</Text> + <Text id="aw453" xml:lang="cs">Vzhledem k potížím s Java(TM) Access Bridge musíte nastavit jazyk systému na "Anglicky (Spojené státy)" nebo "(EN-us)". Jedině při tomto nastavení můžete používat programy, jako např. ZoomText. (Poznámka: Program WindowsEyes nespolupracuje s OpenOffice.org, protože nepodporuje Java Accessibility API.)</Text> + <Text id="aw453" xml:lang="sk">Vzhľadom k problémom s Java(TM) Access Bridge musíte nastaviť jazyk systému na "Anglický (Spojené štáty)" alebo "(EN-us)". Iba pri tomto nastavení môžete používať programy, ako napr. ZoomText. (Poznámka: Program WindowsEyes nespolupracuje s OpenOffice.org, pretože nepodporuje Java Accessibility API.)</Text> + <Text id="aw453" xml:lang="da">På grund af et problem i Java(TM) Access Bridge skal du sætte operativsystemets lokalitetsindstilling til "Engelsk (USA)" eller "(EN-us)". Kun under denne indstilling vil du kunne bruge programmer som ZoomText. (Bemærk, at programmet WindowEyes ikke virker sammen med OpenOffice.org, fordi det ikke understøtter Java Accessibility API.)</Text> +--- sw/sdi/swslots.src.orig3 2004-09-25 10:25:27.253251316 +0200 ++++ sw/sdi/swslots.src 2004-09-25 10:25:36.021430230 +0200 +@@ -2087,7 +2087,7 @@ + SlotName[ dutch ] = "Naar einde volgende pagina"; + SlotName[ french ] = " la fin de la page suivante"; + SlotName[ spanish ] = "Ir al final de la pgina siguiente"; +- SlotName[ italian ] = "Alla fine dell pagina successiva"; ++ SlotName[ italian ] = "Alla fine della pagina successiva"; + SlotName[ danish ] = "Til nste sides slutning"; + SlotName[ swedish ] = "Till slutet av nsta sida"; + SlotName[ polish ] = "Do koca nastpnej strony"; +--- starmath/sdi/smslots.src.orig 2004-09-24 11:38:08.000000000 +0200 ++++ starmath/sdi/smslots.src 2004-09-25 10:27:54.263250424 +0200 +@@ -866,7 +866,7 @@ + SlotName[ dutch ] = "Symbolen"; + SlotName[ french ] = "Symboles"; + SlotName[ spanish ] = "Smbolos"; +- SlotName[ italian ] = "Symboli"; ++ SlotName[ italian ] = "Simboli"; + SlotName[ danish ] = "Symboler"; + SlotName[ swedish ] = "Symboler"; + SlotName[ polish ] = "Symbole"; +--- wizards/source/template/template.src.orig 2004-09-24 11:38:43.000000000 +0200 ++++ wizards/source/template/template.src 2004-09-25 10:29:28.955181542 +0200 +@@ -683,7 +683,7 @@ + Text[ dutch ] = "Fout"; + Text[ french ] = "Une erreur est survenue !"; + Text[ spanish ] = "Ha ocurrido un error."; +- Text[ italian ] = "Si verificato un'errore."; ++ Text[ italian ] = "Si verificato un errore."; + Text[ swedish ] = "Det har uppsttt ett fel!"; + Text[ russian ] = ""; + Text[ greek ] = ""; +--- sysui/oounix/office/cde/impress.lng.orig 2004-09-25 10:30:36.604560864 +0200 ++++ sysui/oounix/office/cde/impress.lng 2004-09-25 10:30:47.992793038 +0200 +@@ -51,7 +51,7 @@ + 33 = "Modle de prsentation %PRODUCTNAME" + 34 = "Plantilla de presentacin %PRODUCTNAME" + 35 = "%PRODUCTNAME - Esitysmalli" +-39 = "Modello di poresentazione %PRODUCTNAME" ++39 = "Modello di presentazione %PRODUCTNAME" + 45 = "%PRODUCTNAME-prsentationsskabelon" + 46 = "%PRODUCTNAME-presentationsmall" + 48 = "%PRODUCTNAME Presentation Template" diff --git a/patches/OOO_1_1/libgl-soname.diff b/patches/OOO_1_1/libgl-soname.diff new file mode 100644 index 000000000..b031b5253 --- /dev/null +++ b/patches/OOO_1_1/libgl-soname.diff @@ -0,0 +1,16 @@ +Index: unx/source/gdi/salogl.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/source/gdi/salogl.cxx,v +retrieving revision 1.7 +diff -u -r1.7 salogl.cxx +--- vcl/unx/source/gdi/salogl.cxx 15 Apr 2003 16:10:05 -0000 1.7 ++++ vcl/unx/source/gdi/salogl.cxx 5 Jan 2005 15:34:37 -0000 +@@ -90,7 +90,7 @@ + #ifdef MACOSX + #define OGL_LIBNAME "libGL.dylib" + #else +-#define OGL_LIBNAME "libGL.so" ++#define OGL_LIBNAME "libGL.so.1" + #endif + + // ---------- diff --git a/patches/OOO_1_1/ms-interoperability-email-attachment-as-xls-ppt.diff b/patches/OOO_1_1/ms-interoperability-email-attachment-as-xls-ppt.diff new file mode 100644 index 000000000..61620584d --- /dev/null +++ b/patches/OOO_1_1/ms-interoperability-email-attachment-as-xls-ppt.diff @@ -0,0 +1,505 @@ +--- sfx2/source/inc/mailmodel.hxx 2002-08-26 13:30:37.000000000 +0530 ++++ sfx2/source/inc/mailmodel.hxx 2004-11-30 17:05:01.000000000 +0530 +@@ -90,6 +90,9 @@ + enum MailDocType + { + TYPE_SELF, ++ TYPE_ASMSDOC, ++ TYPE_ASMSEXCEL, ++ TYPE_ASMSPOWERPOINT, + TYPE_ASPDF + }; + +@@ -114,7 +117,7 @@ + void ClearList( AddressList_Impl* pList ); + void MakeValueList( AddressList_Impl* pList, String& rValueList ); + SaveResult SaveDocument( String& rFileName, String& rType ); +- SaveResult SaveDocAsPDF( String& rFileName, String& rType ); ++ SaveResult SaveDocAs( String& rFileName, String& rType,MailDocType mailDocType ); + + DECL_LINK( DoneHdl, void* ); + + +--- sfx2/source/dialog/mailmodel.cxx 2004-11-26 21:41:16.000000000 +0530 ++++ sfx2/source/dialog/mailmodel.cxx 2004-11-30 17:09:23.000000000 +0530 +@@ -402,7 +402,7 @@ + return eRet; + } + +-SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName, String& rType ) ++SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAs( String& rFileName, String& rType,MailDocType mailDocType ) + { + SaveResult eRet = SAVE_CANCELLED; + SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame(); +@@ -422,9 +422,15 @@ + SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer(); + if ( pFilterContainer ) + { +- String aPDFExtension = String::CreateFromAscii( ".pdf" ); ++ String aExtension ; ++ switch (mailDocType){ ++ case TYPE_ASPDF : aExtension = String::CreateFromAscii( ".pdf" );break; ++ case TYPE_ASMSDOC : aExtension = String::CreateFromAscii( ".doc" );break; ++ case TYPE_ASMSEXCEL : aExtension = String::CreateFromAscii( ".xls" );break; ++ case TYPE_ASMSPOWERPOINT : aExtension = String::CreateFromAscii( ".ppt" );break; ++ } + +- const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT ); ++ const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aExtension, SFX_FILTER_EXPORT ); + sal_Bool bHasFilter = pFilter ? sal_True : sal_False; + + // create temp file name with leading chars and extension +@@ -440,7 +446,7 @@ + String aName; + if ( aFileObj.hasExtension() ) + { +- pExt = new String( aPDFExtension ); ++ pExt = new String( aExtension ); + aFileObj.removeExtension(); + aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + // aLeadingStr += String::CreateFromAscii( "_" ); +@@ -463,11 +469,25 @@ + delete pExt; + + rFileName = aTempFile.GetURL(); ++ SfxBoolItem aPicklist( SID_PICKLIST, FALSE ); ++ SfxBoolItem aSaveTo( SID_SAVETO, TRUE ); ++ SfxStringItem* pFilterName = NULL; ++ if ( pFilter && bHasFilter ) ++ pFilterName = new SfxStringItem( SID_FILTER_NAME, pFilter->GetFilterName() ); ++ ++ SfxStringItem* pPassItem = NULL; ++ String aPasswd; ++ if ( GetPasswd_Impl( xDocShell->GetMedium()->GetItemSet(), aPasswd ) ) ++ pPassItem = new SfxStringItem( SID_PASSWORD, aPasswd ); + + // save document to temp file + SfxStringItem aFileName( SID_FILE_NAME, rFileName ); +- const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L ); +- BOOL bRet = pRet ? pRet->GetValue() : FALSE; ++ const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON, &aFileName, &aPicklist, &aSaveTo, ++ pFilterName ? pFilterName : pPassItem, ++ pFilterName ? pPassItem : 0L, 0L ); ++ ++/* const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L ); ++*/ BOOL bRet = pRet ? pRet->GetValue() : FALSE; + eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED; + + if ( pFilter ) +@@ -568,11 +590,16 @@ + String aFileName, aContentType; + + sal_Bool bSuccessfull = sal_False; +- if ( eMailDocType == TYPE_SELF ) +- eSaveResult = SaveDocument( aFileName, aContentType ); +- else +- eSaveResult = SaveDocAsPDF( aFileName, aContentType ); +- ++ switch (eMailDocType){ ++ case TYPE_ASMSDOC: ++ case TYPE_ASMSPOWERPOINT: ++ case TYPE_ASPDF: ++ case TYPE_ASMSEXCEL: ++ eSaveResult = SaveDocAs( aFileName, aContentType,eMailDocType ); ++ break; ++ default: ++ eSaveResult = SaveDocument( aFileName, aContentType); ++ } + if ( eSaveResult == SAVE_SUCCESSFULL ) + { + SfxFrame* pViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(); + +--- sfx2/sdi/sfx.sdi 2004-03-30 18:26:27.000000000 +0530 ++++ sfx2/sdi/sfx.sdi 2004-11-30 16:36:40.000000000 +0530 +@@ -6982,7 +6982,6 @@ + ToolBoxConfig = TRUE, + GroupId = GID_DOCUMENT; + ] +- + //-------------------------------------------------------------------------- + SfxBoolItem SendMail SID_MAIL_SENDDOC + (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) +@@ -7010,7 +7009,88 @@ + ToolBoxConfig = TRUE, + GroupId = GID_DOCUMENT; + ] ++SfxBoolItem SendMailDocAsMSDoc SID_MAIL_SENDDOCASMSDOC ++(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) ++[ ++ /* flags: */ ++ AutoUpdate = FALSE, ++ Cachable = Cachable, ++ FastCall = FALSE, ++ HasCoreId = FALSE, ++ HasDialog = TRUE, ++ ReadOnlyDoc = TRUE, ++ Toggle = FALSE, ++ Container = FALSE, ++ RecordAbsolute = FALSE, ++ RecordPerSet; ++ Asynchron; ++ ++ /* status: */ ++ SlotType = SfxStringItem + ++ /* config: */ ++ AccelConfig = TRUE, ++ MenuConfig = TRUE, ++ StatusBarConfig = FALSE, ++ ToolBoxConfig = TRUE, ++ GroupId = GID_DOCUMENT; ++] ++//-------------------------------------------------------------------------- ++SfxBoolItem SendMailDocAsMSExcel SID_MAIL_SENDDOCASMSEXCEL ++(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) ++[ ++ /* flags: */ ++ AutoUpdate = FALSE, ++ Cachable = Cachable, ++ FastCall = FALSE, ++ HasCoreId = FALSE, ++ HasDialog = TRUE, ++ ReadOnlyDoc = TRUE, ++ Toggle = FALSE, ++ Container = FALSE, ++ RecordAbsolute = FALSE, ++ RecordPerSet; ++ Asynchron; ++ ++ /* status: */ ++ SlotType = SfxStringItem ++ ++ /* config: */ ++ AccelConfig = TRUE, ++ MenuConfig = TRUE, ++ StatusBarConfig = FALSE, ++ ToolBoxConfig = TRUE, ++ GroupId = GID_DOCUMENT; ++] ++ ++//-------------------------------------------------------------------------- ++SfxBoolItem SendMailDocAsMSPowerPoint SID_MAIL_SENDDOCASMSPOWERPOINT ++(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) ++[ ++ /* flags: */ ++ AutoUpdate = FALSE, ++ Cachable = Cachable, ++ FastCall = FALSE, ++ HasCoreId = FALSE, ++ HasDialog = TRUE, ++ ReadOnlyDoc = TRUE, ++ Toggle = FALSE, ++ Container = FALSE, ++ RecordAbsolute = FALSE, ++ RecordPerSet; ++ Asynchron; ++ ++ /* status: */ ++ SlotType = SfxStringItem ++ ++ /* config: */ ++ AccelConfig = TRUE, ++ MenuConfig = TRUE, ++ StatusBarConfig = FALSE, ++ ToolBoxConfig = TRUE, ++ GroupId = GID_DOCUMENT; ++] ++//-------------------------------------------------------------------------- + SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF + (SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE) + [ + +--- sfx2/sdi/sfxslots.src 2004-11-26 21:41:10.000000000 +0530 ++++ sfx2/sdi/sfxslots.src 2004-11-30 16:56:29.000000000 +0530 +@@ -4756,6 +4756,24 @@ + SlotName[ kannada ] = "ದಸ್ತಾವೇಜನ್ನು ಕಳಿಸು"; + SlotName[ galician ] = "Enviar o documento"; + }; ++SfxSlotInfo SID_MAIL_SENDDOCASMSDOC ++{ ++ SlotName = "Send document as MS-DOC Attachment"; ++ SlotName [ english ] = "Send document as MS-DOC Attachment"; ++ SlotName [ english_us ] = "Send document as MS-DOC Attachment"; ++}; ++SfxSlotInfo SID_MAIL_SENDDOCASMSEXCEL ++{ ++ SlotName = "Send document as MS-EXCEL Attachment"; ++ SlotName [ english ] = "Send document as MS-EXCEL Attachment"; ++ SlotName [ english_us ] = "Send document as MS-EXCEL Attachment"; ++}; ++SfxSlotInfo SID_MAIL_SENDDOCASMSPOWERPOINT ++{ ++ SlotName = "Send document as MS-POWERPOINT Attachment"; ++ SlotName [ english ] = "Send document as MS-POWERPOINT Attachment"; ++ SlotName [ english_us ] = "Send document as MS-POWERPOINT Attachment"; ++}; + SfxSlotInfo SID_MAIL_SENDDOCASPDF + { + SlotName = "Dokument als PDF-Anhang versenden"; + +--- sfx2/inc/sfxsids.hrc 2004-11-26 21:41:02.000000000 +0530 ++++ sfx2/inc/sfxsids.hrc 2004-11-30 16:30:43.000000000 +0530 +@@ -147,7 +147,10 @@ + #define SID_MAIL_OPEN (SID_SFX_START + 329) + #define SID_MAIL_NOTIFY (SID_SFX_START + 330) + #define SID_MAIL_SENDDOC (SID_SFX_START + 331) +-#define SID_MAIL_SENDDOCASPDF (SID_SFX_START + 1672) ++#define SID_MAIL_SENDDOCASPDF (SID_SFX_START + 1672) ++#define SID_MAIL_SENDDOCASMSDOC (SID_SFX_START + 1686) ++#define SID_MAIL_SENDDOCASMSEXCEL (SID_SFX_START + 1687) ++#define SID_MAIL_SENDDOCASMSPOWERPOINT (SID_SFX_START + 1688) + #define SID_MAIL_INBOX (SID_SFX_START + 332) + + #define SID_MAIL_RECIPIENT (SID_SFX_START + 334) +@@ -554,7 +557,7 @@ + #define SID_REPAIRPACKAGE (SID_SFX_START + 1683) + #define SID_ADDONHELP (SID_SFX_START + 1684) + #define SID_OBJECTSHELL (SID_SFX_START + 1685) +-#define SID_SFX_free_START (SID_SFX_START + 1686) ++#define SID_SFX_free_START (SID_SFX_START + 1689) + #define SID_SFX_free_END (SID_SFX_START + 3999) + + #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) + +--- sfx2/sdi/viwslots.sdi 2002-08-26 13:02:06.000000000 +0530 ++++ sfx2/sdi/viwslots.sdi 2004-11-30 22:05:45.000000000 +0530 +@@ -22,6 +22,21 @@ + ExecMethod = ExecMisc_Impl ; + StateMethod = GetState_Impl ; + ] ++ SID_MAIL_SENDDOCASMSDOC // ole(no) api(todo) ++ [ ++ ExecMethod = ExecMisc_Impl ; ++ StateMethod = GetState_Impl ; ++ ] ++ SID_MAIL_SENDDOCASMSEXCEL // ole(no) api(todo) ++ [ ++ ExecMethod = ExecMisc_Impl ; ++ StateMethod = GetState_Impl ; ++ ] ++ SID_MAIL_SENDDOCASMSPOWERPOINT // ole(no) api(todo) ++ [ ++ ExecMethod = ExecMisc_Impl ; ++ StateMethod = GetState_Impl ; ++ ] + //--------------------------------------------------------------------- + SID_PRINTDOC // ole(no) api(play/rec) + [ + +--- sfx2/source/view/viewsh.cxx 2003-11-07 15:42:06.000000000 +0530 ++++ sfx2/source/view/viewsh.cxx 2004-12-01 17:46:28.075380424 +0530 +@@ -185,6 +185,9 @@ + + case SID_MAIL_SENDDOCASPDF: + case SID_MAIL_SENDDOC: ++ case SID_MAIL_SENDDOCASMSDOC: ++ case SID_MAIL_SENDDOCASMSEXCEL: ++ case SID_MAIL_SENDDOCASMSPOWERPOINT: + if ( SvtInternalOptions().MailUIEnabled() ) + { + GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, TRUE ); +@@ -209,10 +212,18 @@ + } + + SfxMailModel_Impl::SendMailResult eResult = SfxMailModel_Impl::SEND_MAIL_ERROR; +- if ( nId == SID_MAIL_SENDDOCASPDF ) +- eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF ); +- else +- eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF ); ++ switch (nId) { ++ case SID_MAIL_SENDDOCASPDF: ++ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF );break; ++ case SID_MAIL_SENDDOCASMSDOC: ++ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSDOC );break; ++ case SID_MAIL_SENDDOCASMSEXCEL: ++ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSEXCEL );break; ++ case SID_MAIL_SENDDOCASMSPOWERPOINT: ++ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSPOWERPOINT );break; ++ default: ++ eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF ); ++ } + + if ( eResult == SfxMailModel_Impl::SEND_MAIL_ERROR ) + { +@@ -325,6 +336,9 @@ + // Mail-Funktionen + case SID_MAIL_SENDDOCASPDF: + case SID_MAIL_SENDDOC: ++ case SID_MAIL_SENDDOCASMSDOC: ++ case SID_MAIL_SENDDOCASMSEXCEL: ++ case SID_MAIL_SENDDOCASMSPOWERPOINT: + { + BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN ); + if ( !bEnable ) +@@ -348,6 +362,60 @@ + rSet.DisableItem( nSID ); + } + ++ else if ( nSID == SID_MAIL_SENDDOCASMSDOC ) ++ { ++ SfxObjectShellRef xDocShell = GetViewFrame()->GetObjectShell(); ++ if ( xDocShell.Is() ) ++ { ++ // Get PDF Filter from container ++ SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer(); ++ if ( pFilterContainer ) ++ { ++ String aPDFExtension = String::CreateFromAscii( ".doc" ); ++ const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT ); ++ if ( pFilter != NULL ) ++ break; ++ } ++ } ++ ++ rSet.DisableItem( nSID ); ++ } ++ else if ( nSID == SID_MAIL_SENDDOCASMSEXCEL ) ++ { ++ SfxObjectShellRef xDocShell = GetViewFrame()->GetObjectShell(); ++ if ( xDocShell.Is() ) ++ { ++ // Get PDF Filter from container ++ SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer(); ++ if ( pFilterContainer ) ++ { ++ String aPDFExtension = String::CreateFromAscii( ".xls" ); ++ const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT ); ++ if ( pFilter != NULL ) ++ break; ++ } ++ } ++ ++ rSet.DisableItem( nSID ); ++ } ++ else if ( nSID == SID_MAIL_SENDDOCASMSPOWERPOINT ) ++ { ++ SfxObjectShellRef xDocShell = GetViewFrame()->GetObjectShell(); ++ if ( xDocShell.Is() ) ++ { ++ // Get PDF Filter from container ++ SfxFactoryFilterContainer* pFilterContainer = xDocShell->GetFactory().GetFilterContainer(); ++ if ( pFilterContainer ) ++ { ++ String aPDFExtension = String::CreateFromAscii( ".ppt" ); ++ const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT ); ++ if ( pFilter != NULL ) ++ break; ++ } ++ } ++ ++ rSet.DisableItem( nSID ); ++ } + break; + } + + +--- svx/inc/globlmn.hrc 2004-11-26 21:40:58.000000000 +0530 ++++ svx/inc/globlmn.hrc 2004-12-01 17:33:01.865942888 +0530 +@@ -3251,6 +3251,30 @@ + Text[ kannada ] = "ಸ್ವಯಂಚಾಲಿತ ಅಂಚೆ"; \ + Text[ galician ] = "~Correo automtico"; \ + ++#define ITEM_FILE_MAIL_SENDDOCASMSDOC \ ++ Identifier = SID_MAIL_SENDDOCASMSDOC ; \ ++ Command = ".uno:SendMailDocAsMSDoc" ; \ ++ HelpID = SID_MAIL_SENDDOCASMSDOC ; \ ++ Text = "Dokument als E-~Mail..." ; \ ++ Text [ english ] = "Document as MS-~Doc Attachment..." ; \ ++ Text [ english_us ] = "Document as MS-~Doc Attachment..." ; \ ++ ++#define ITEM_FILE_MAIL_SENDDOCASMSEXCEL \ ++ Identifier = SID_MAIL_SENDDOCASMSEXCEL ; \ ++ Command = ".uno:SendMailDocAsMSExcel" ; \ ++ HelpID = SID_MAIL_SENDDOCASMSEXCEL ; \ ++ Text = "Dokument als ~E-Mail..." ; \ ++ Text [ english ] = "Document as MS-~Excel Attachment..." ; \ ++ Text [ english_us ] = "Document as MS-~Excel Attachment..." ; \ ++ ++#define ITEM_FILE_MAIL_SENDDOCASMSPOWERPOINT \ ++ Identifier = SID_MAIL_SENDDOCASMSPOWERPOINT ; \ ++ Command = ".uno:SendMailDocAsMSPowerPoint" ; \ ++ HelpID = SID_MAIL_SENDDOCASMSPOWERPOINT ; \ ++ Text = "Dokument als E-Mail..." ; \ ++ Text [ english ] = "Document as MS-~PPT Attachment..." ; \ ++ Text [ english_us ] = "Document as MS-~PPT Attachment..." ; \ ++ + #define ITEM_FILE_MAIL_SENDDOC \ + Identifier = SID_MAIL_SENDDOC ; \ + Command = ".uno:SendMail" ; \ + +--- sw/sdi/wviewsh.sdi 2003-03-27 21:09:12.000000000 +0530 ++++ sw/sdi/wviewsh.sdi 2004-11-29 20:58:45.000000000 +0530 +@@ -223,6 +223,11 @@ + [ + StateMethod = GetState ; + ] ++ SID_MAIL_SENDDOCASMSDOC ++ [ ++ ExecMethod = Execute ; ++ StateMethod = GetState ; ++ ] + } + + shell SwSrcView : SfxViewShell + +--- sw/source/ui/inc/swmn.hrc 2004-11-26 21:41:10.000000000 +0530 ++++ sw/source/ui/inc/swmn.hrc 2004-11-29 21:04:08.000000000 +0530 +@@ -5121,6 +5121,10 @@ + { + ITEM_FILE_MAIL_SENDDOCASPDF + }; ++ MenuItem ++ { ++ ITEM_FILE_MAIL_SENDDOCASMSDOC ++ }; + }; + }; + Text[ english_us ] = "Send"; +@@ -5182,6 +5186,11 @@ + { + ITEM_FILE_MAIL_SENDDOCASPDF + }; ++ MenuItem ++ { ++ ITEM_FILE_MAIL_SENDDOCASMSDOC ++ }; ++ + SEPARATOR ; + MenuItem + { + +--- /home/mjayant/OOO_113_backup/ooo-build/build/OOO_1_1_3/sd/source/ui/app/menuids2.src 2004-11-26 21:41:10.000000000 +0530 ++++ sd/source/ui/app/menuids2.src 2004-11-30 21:47:12.000000000 +0530 +@@ -249,6 +249,7 @@ + {\ + MI ( ITEM_FILE_MAIL_SENDDOC ) \ + MI ( ITEM_FILE_MAIL_SENDDOCASPDF ) \ ++ MI ( ITEM_FILE_MAIL_SENDDOCASMSPOWERPOINT ) \ + };\ + };\ + Text [ portuguese_brazilian ] = "~Enviar" ; \ + +--- sc/source/ui/src/menue.src 2004-11-26 21:41:10.000000000 +0530 ++++ sc/source/ui/src/menue.src 2004-12-01 18:05:15.435995560 +0530 +@@ -342,6 +342,10 @@ + { + ITEM_FILE_MAIL_SENDDOCASPDF + }; ++ MenuItem ++ { ++ ITEM_FILE_MAIL_SENDDOCASMSEXCEL ++ }; + }; + }; + Text [ portuguese ] = "~Enviar" ; +@@ -6397,6 +6401,10 @@ + { + ITEM_FILE_MAIL_SENDDOCASPDF + }; ++ MenuItem ++ { ++ ITEM_FILE_MAIL_SENDDOCASMSEXCEL ++ }; + }; + }; + Text [ portuguese ] = "~Enviar" ; diff --git a/patches/OOO_1_1/native-fpicker-not-default.diff b/patches/OOO_1_1/native-fpicker-not-default.diff new file mode 100644 index 000000000..26de5a2de --- /dev/null +++ b/patches/OOO_1_1/native-fpicker-not-default.diff @@ -0,0 +1,17 @@ +Index: Common.xcu +=================================================================== +RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v +retrieving revision 1.13.34.2 +diff -u -r1.13.34.2 Common.xcu +--- officecfg/registry/data/org/openoffice/Office/Common.xcu 6 Jul 2004 10:50:06 -0000 1.13.34.2 ++++ officecfg/registry/data/org/openoffice/Office/Common.xcu 21 Dec 2004 15:40:02 -0000 +@@ -437,4 +437,9 @@ + </node> + </node> + </node> ++ <node oor:name="Misc"> ++ <prop oor:name="UseSystemFileDialog" oor:type="xs:boolean"> ++ <value>false</value> ++ </prop> ++ </node> + </oor:component-data> diff --git a/patches/OOO_1_1/novell-japanese-fonts.diff b/patches/OOO_1_1/novell-japanese-fonts.diff index 870f8103b..1d41ce06e 100644 --- a/patches/OOO_1_1/novell-japanese-fonts.diff +++ b/patches/OOO_1_1/novell-japanese-fonts.diff @@ -1,6 +1,6 @@ ---- officecfg/registry/data/org/openoffice/VCL.xcu.orig 2004-09-23 17:24:21.660322994 +0200 -+++ officecfg/registry/data/org/openoffice/VCL.xcu 2004-09-23 17:33:21.481583768 +0200 -@@ -452,25 +452,25 @@ +--- officecfg/registry/data/org/openoffice/VCL.xcu 2005-01-18 13:36:29.538302380 -0800 ++++ officecfg/registry/data/org/openoffice/VCL.xcu 2005-01-18 13:39:04.100290571 -0800 +@@ -457,25 +457,25 @@ </node> <node oor:name="ja-jp" oor:op="replace"> <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace"> @@ -13,11 +13,11 @@ </prop> <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace"> - <value>Andale Sans UI;MS P ゴシック;TLPゴシック;LXゴシック;東風ゴシック;kochigothic;Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -+ <value>Andale Sans UI;MS P ゴシック;HGPGothicB;TLPゴシック;LXゴシック;IPAPGothic;Sazanami Gothic;東風ゴシック;kochigothic;Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> ++ <value>Andale Sans UI;MS P ゴシック;HGPGothicB;TLPゴシック;LXゴシック;IPAPGothic;Sazanami Gothic;東風ゴシック;kochigothic;Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> </prop> <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace"> - <value>HG Mincho Light J;MS P 明朝;TLP明朝;LX明朝;東風明朝;Kochi Mincho;Mincho;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> -+ <value>HG Mincho Light J;MS P 明朝;HGPMinchoL;TLP明朝;LX明朝;IPAPMincho;Sazanami Mincho;東風明朝;Kochi Mincho;Mincho;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> ++ <value>HG Mincho Light J;MS P 明朝;HGPMinchoL;TLP明朝;LX明朝;IPAPMincho;Sazanami Mincho;東風明朝;Kochi Mincho;Mincho;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> </prop> <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace"> - <value>HG Mincho Light J;MS P ゴシック;TLPゴシック;LXゴシック;東風ゴシック;kochigothic;Gothic;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> @@ -29,16 +29,7 @@ </prop> <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace"> - <value>Andale Sans UI;HG Mincho Light J;MS UI Gothic;TLPゴシック;LXゴシック;東風ゴシック;kochigothic;Gothic;gnu-unifont</value> -+ <value>Andale Sans UI;HG Mincho Light J;MS UI Gothic;HGPGothicB;TLPゴシック;LXゴシック;IPAUIGothic;Sazanami Gothic;東風ゴシック;kochigothic;Gothic;gnu-unifont</value> ++ <value>方正宋体;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> </prop> <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace"> <value>HG Mincho Light J;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> -@@ -502,7 +502,7 @@ - <value>方正宋体;MSung Light SC;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> - </prop> - <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace"> -- <value>Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> -+ <value>方正宋体;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> - </prop> - </node> - <node oor:name="zh-tw" oor:op="replace"> diff --git a/patches/OOO_1_1/qpro-cxx.diff b/patches/OOO_1_1/qpro-cxx.diff new file mode 100644 index 000000000..7e351784a --- /dev/null +++ b/patches/OOO_1_1/qpro-cxx.diff @@ -0,0 +1,423 @@ +--- /dev/null 2004-08-25 23:04:59.000000000 +0530 ++++ sc/source/filter/qpro/qpro.cxx 2004-12-15 14:43:15.017599352 +0530 +@@ -0,0 +1,420 @@ ++#ifdef PCH ++#include "filt_pch.hxx" ++#endif ++ ++#pragma hdrstop ++ ++//------------------------------------------------------------------------ ++ ++#include <stdio.h> ++#include <sfx2/docfile.hxx> ++#include <rtl/math.hxx> ++ ++ ++#include "qproform.hxx" ++#include "qpro.hxx" ++ ++#include <tools/color.hxx> ++#include "scitems.hxx" ++#include <svx/algitem.hxx> ++#include <svx/align.hxx> ++#include <svx/udlnitem.hxx> ++#include <svx/wghtitem.hxx> ++#include <svx/postitem.hxx> ++#include <svx/crsditem.hxx> ++#include <svx/fhgtitem.hxx> ++#include <svx/fontitem.hxx> ++#include <svx/colritem.hxx> ++#include <map> ++ ++#include "global.hxx" ++#include "sc.hrc" ++#include "globstr.hrc" ++#include "attrib.hxx" ++#include "stlsheet.hxx" ++#include "stlpool.hxx" ++#include "docpool.hxx" ++#include "patattr.hxx" ++#include "flttools.hxx" ++#include "filter.hxx" ++#include "scerrors.hxx" ++#include "document.hxx" ++#include "cell.hxx" ++#include "math.h" ++ ++extern std::map<UINT16, ScPatternAttr> aPatternPool; ++ ++BiffReader::BiffReader( SfxMedium & rMedium ) : ++ mnId(0), ++ mnLength(0), ++ mnOffset(0), ++ meCharSet( RTL_TEXTENCODING_ISO_8859_1 ) // FIXME detect as we parse ++{ ++ mpStream = rMedium.GetInStream(); ++ if( mpStream ) ++ mpStream->SetBufferSize( 65536 ); ++} ++ ++BiffReader::~BiffReader() ++{ ++ if( mpStream ) ++ mpStream->SetBufferSize( 0 ); ++} ++ ++SvStream& BiffReader::operator>>( sal_uInt8 &rByte ) ++{ ++ return *mpStream >> rByte; ++} ++ ++SvStream& BiffReader::operator>>( sal_Int8 &rByte ) ++{ ++ return *mpStream >> rByte; ++} ++ ++SvStream& BiffReader::operator>>(sal_uInt16 &rWord) ++{ ++ return *mpStream >> rWord; ++} ++ ++bool BiffReader::nextRecord() ++{ ++ if( !recordsLeft() ) ++ return false; ++ ++ if( EndOfFile ) ++ return false; ++ ++ sal_uInt32 nPos = mpStream->Tell(); ++ if( nPos != mnOffset + mnLength ) ++ mpStream->Seek( mnOffset + mnLength ); ++ ++ mnLength = mnId = 0; ++ *mpStream >> mnId >> mnLength; ++ ++ mnOffset = mpStream->Tell(); ++#ifdef DEBUG ++ fprintf( stderr, "Read record 0x%x length 0x%x at offset 0x%x\n", ++ mnId, mnLength, mnOffset ); ++ ++ #if 1 // rather verbose ++ int len = mnLength; ++ while (len > 0) { ++ int i, chunk = len < 16 ? len : 16; ++ unsigned char data[16]; ++ mpStream->Read( data, chunk ); ++ ++ for (i = 0; i < chunk; i++) ++ fprintf( stderr, "%.2x ", data[i] ); ++ fprintf( stderr, "| " ); ++ for (i = 0; i < chunk; i++) ++ fprintf( stderr, "%c", data[i] < 127 && data[i] > 30 ? data[i] : '.' ); ++ fprintf( stderr, "\n" ); ++ ++ len -= chunk; ++ } ++ mpStream->Seek( mnOffset ); ++#endif ++#endif ++ return true; ++} ++ ++void BiffReader::readString( String &rString, sal_uInt16 nLength ) ++{ ++ sal_Char* pText = new sal_Char[ nLength + 1 ]; ++ mpStream->Read( pText, nLength ); ++ pText[ nLength ] = 0; ++ rString = String( pText, meCharSet ); ++} ++ ++void BiffReader::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow, sal_uInt8 nTab, sal_uInt16 nStyle ){ ++ ScPatternAttr aPattern(pDoc->GetPool()); ++ SfxItemSet& rItemSet = aPattern.GetItemSet(); ++ ++ sal_uInt8 nTmp = Align[ nStyle ]; ++ sal_uInt8 nHor = ( nTmp & 0x07 ); ++ sal_uInt8 nVer = ( nTmp & 0x18 ); ++ sal_uInt8 nOrient = ( nTmp & 0x60 ); ++ ++ ++ // Horizontal Alignment ++ SvxHorJustifyItem ejustify = SVX_HOR_JUSTIFY_STANDARD; ++ switch( nHor ) ++ { ++ ++ case 0x00: ++ ejustify = SVX_HOR_JUSTIFY_STANDARD; ++ break; ++ ++ case 0x01: ++ ejustify = SVX_HOR_JUSTIFY_LEFT; ++ break; ++ ++ case 0x02: ++ ejustify = SVX_HOR_JUSTIFY_CENTER; ++ break; ++ ++ case 0x03: ++ ejustify = SVX_HOR_JUSTIFY_RIGHT; ++ break; ++ ++ case 0x04: ++ ejustify = SVX_HOR_JUSTIFY_BLOCK; ++ break; ++ ++ } ++ rItemSet.Put( ejustify ); ++ ++ // Vertical Alignment ++ SvxVerJustifyItem verJustify = SVX_VER_JUSTIFY_STANDARD; ++ switch( nVer ) ++ { ++ ++ case 0x00: ++ verJustify = SVX_VER_JUSTIFY_BOTTOM; ++ break; ++ ++ case 0x08: ++ verJustify = SVX_VER_JUSTIFY_CENTER; ++ break; ++ ++ case 0x10: ++ verJustify = SVX_VER_JUSTIFY_TOP; ++ break; ++ ++ } ++ rItemSet.Put( verJustify ); ++ ++ // Orientation ++ SvxOrientationItem orientItem = SVX_ORIENTATION_STANDARD; ++ switch( nOrient ) ++ { ++ ++ case 0x20: ++ orientItem = SVX_ORIENTATION_TOPBOTTOM; ++ break; ++ ++ } ++ rItemSet.Put( orientItem ); ++ ++ // Wrap cell contents ++ if( nTmp & 0x80 ) ++ { ++ SfxBoolItem WrapItem( ATTR_LINEBREAK ); ++ WrapItem.SetValue( TRUE ); ++ rItemSet.Put( WrapItem ); ++ } ++ ++ // Font Attributes ++ sal_uInt16 nTmpFnt = FontRecord[ Font[ nStyle ] ]; ++ BOOL bIsBold, bIsItalic, bIsUnderLine, bIsStrikeThrough; ++ ++ bIsBold = ( nTmpFnt & 0x0001 ); ++ bIsItalic = ( nTmpFnt & 0x0002 ); ++ bIsUnderLine = ( nTmpFnt & 0x0004 ); ++ bIsStrikeThrough = (nTmpFnt & 0x0020 ); ++ ++ if( bIsBold ) ++ rItemSet.Put( SvxWeightItem( WEIGHT_BOLD,ATTR_FONT_WEIGHT) ); ++ if( bIsItalic ) ++ rItemSet.Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); ++ if( bIsUnderLine ) ++ rItemSet.Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) ); ++ if( bIsStrikeThrough ) ++ rItemSet.Put( SvxCrossedOutItem( STRIKEOUT_SINGLE, ATTR_FONT_CROSSEDOUT ) ); ++ ++ String fntName = FontType[ Font[ nStyle ] ]; ++ rItemSet.Put( SvxFontItem( FAMILY_SYSTEM, fntName, EMPTY_STRING ) ); ++ ++ pDoc->ApplyPattern( nCol, nRow, nTab, aPattern ); ++} ++ ++ColorData BiffReader::MapIntToColor( sal_uInt16 ColorId ) ++{ ++ ColorData fColor; ++ switch( ColorId ) ++ { ++ case 0x0000: fColor = COL_WHITE; ++ break; ++ ++ case 0x1000: fColor = COL_LIGHTGRAY; ++ break; ++ ++ case 0x2000: fColor = COL_GRAY; ++ break; ++ ++ case 0x3000: fColor = COL_BLACK; ++ break; ++ ++ case 0x4000: fColor = COL_RED; ++ break; ++ ++ case 0x5000: fColor = COL_GREEN; ++ break; ++ ++ case 0x6000: fColor = COL_BLUE; ++ break; ++ ++ case 0x7000: fColor = COL_CYAN; ++ break; ++ ++ case 0x8000: fColor = COL_MAGENTA; ++ break; ++ ++ case 0x9000: fColor = COL_YELLOW; ++ break; ++ ++ case 0xb000: fColor = COL_LIGHTGREEN; ++ break; ++ } ++ ++ return fColor; ++} ++ ++readQProSheet( BiffReader &rReader, ScDocument *pDoc, sal_uInt16 nTab ) ++{ ++ sal_uInt8 nCol, nDummy; ++ sal_uInt16 nRow; ++ sal_uInt16 nStyle; ++ bool bEndOfSheet = false; ++ ++#ifdef DEBUG ++ fprintf( stderr, "Read sheet (%d)\n", nTab ); ++#endif ++ ++ while( !bEndOfSheet && rReader.nextRecord() ) { ++ switch( rReader.getId() ) ++ { ++ case 0x000f: { // Label cell ++ String aLabel; ++ rReader >> nCol >> nDummy >> nRow >> nStyle >> nDummy; ++ rReader.readString( aLabel, rReader.getLength() - 7 ); ++#ifdef DEBUG ++ fprintf( stderr, "Put Cell %d %d %d '%s'\n", ++ nCol, nRow, nTab, ++ (const sal_Char *)rtl::OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ) ); ++#endif ++ nStyle = ( nStyle & 0xfff8 ) >> 3; ++ rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle ); ++ pDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aLabel ), (BOOL) TRUE ); ++ break; ++ } ++ case 0x00cb: // End of sheet; ++ bEndOfSheet = true; ++ break; ++ ++ case 0x000c: // Blank cell ++ rReader >> nCol >> nDummy >> nRow >> nStyle; ++ rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle ); ++ break; ++ ++ case 0x000d: { // Integer cell ++ sal_Int16 nValue; ++ rReader >> nCol >> nDummy >> nRow >> nStyle >> nValue; ++ ScValueCell* aInteger = new ScValueCell( ( double ) nValue ); ++#ifdef DEBUG ++ fprintf( stderr, "Put Cell %d %d %d %f\n", nCol, nRow, nTab, nValue ); ++#endif ++ rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle ); ++ pDoc->PutCell(nCol ,nRow, nTab ,aInteger,(BOOL) TRUE); ++ break; ++ } ++ ++ case 0x000e: { // Floating point cell ++ double nValue; ++ rReader >> nCol >> nDummy >> nRow >> nStyle >> nValue; ++ ScValueCell* aFloat = new ScValueCell( nValue ); ++#ifdef DEBUG ++ fprintf( stderr, "Put Cell %d %d %d %f\n", nCol, nRow, nTab, nValue ); ++#endif ++ rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle ); ++ pDoc->PutCell( nCol, nRow, nTab, aFloat, (BOOL) TRUE ); break; ++ } ++ ++ case 0x0010: { // Formula cell ++ double nValue; ++ sal_uInt16 nState, nLen; ++ rReader >> nCol >> nDummy >> nRow >> nStyle >> nValue >> nState >> nLen; ++ ScAddress aAddr( nCol, nRow, nTab ); ++ const ScTokenArray *pErg; ++ QProToSc aConv( rReader ); ++ aConv.Reset( aAddr ); ++ aConv.Convert( pErg, nLen ); ++ ScFormulaCell *pZelle = new ScFormulaCell( pDoc, aAddr, pErg ); ++#ifdef DEBUG ++ fprintf( stderr, "Put Cell %d %d %d %f\n", nCol, nRow, nTab, nValue ); ++#endif ++ pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE ); ++ rReader.SetFormat( pDoc, nCol, nRow, nTab, nStyle ); ++ pDoc->PutCell( nCol, nRow, nTab, pZelle, ( BOOL ) TRUE ); ++ break; } ++ ++ } ++ } ++ return eERR_OK; ++} ++ ++FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) ++{ ++ FltError eRet = eERR_OK; ++ BiffReader aReader( rMedium ); ++ sal_uInt16 nVersion; ++ int nTab = 0, i = 1, j = 1; ++ aReader.EndOfFile = FALSE; ++ ++ if( !aReader.recordsLeft() ) ++ return eERR_OPEN; ++ ++ while( aReader.nextRecord() && eRet == eERR_OK) { ++ switch( aReader.getId() ) ++ { ++ case 0x0000: // Begginning of file ++ aReader >> nVersion; ++ break; ++ ++ case 0x00ca: // Beginning of sheet ++ if( nTab < 26 ) ++ { ++ String aName; ++ aName.Append( sal_Unicode( 'A' + nTab ) ); ++ pDoc->InsertTab( nTab, aName ); ++ } ++ eRet = readQProSheet( aReader, pDoc, nTab ); ++ nTab++; ++ break; ++ ++ case 0x0001: // End of file ++ aReader.EndOfFile = TRUE; ++ break; ++ ++ case 0x00ce: { // Attribute cell ++ sal_uInt8 nFormat, nAlign, nFont; ++ sal_Int16 nTextColor, nColor; ++ aReader >> nFormat >> nAlign >> nColor >> nFont; ++ aReader.Align[ i ] = nAlign; ++ aReader.Font[ i ] = nFont; ++ nTextColor = nColor & 0xf000; ++ aReader.FontColor[ i ] = nTextColor; ++ i++; ++ break; ++ } ++ ++ case 0x00cf: { // Font description ++ sal_uInt16 nPtSize, nFontAttr; ++ String Label; ++ aReader >> nPtSize >> nFontAttr; ++ aReader.FontSize[ j ] = nPtSize; ++ aReader.FontRecord[ j ] = nFontAttr; ++ aReader.readString( Label, aReader.getLength() - 4 ); ++ aReader.FontType[ j ] = Label; ++ j++; ++ break; ++ } ++ ++ } ++ } ++ pDoc->CalcAfterLoad(); ++ return eRet; ++} ++ ++ ++ diff --git a/patches/OOO_1_1/qproform-hxx.diff b/patches/OOO_1_1/qproform-hxx.diff new file mode 100644 index 000000000..3516f9977 --- /dev/null +++ b/patches/OOO_1_1/qproform-hxx.diff @@ -0,0 +1,74 @@ +--- /dev/null 2004-08-25 23:04:59.000000000 +0530 ++++ sc/source/filter/inc/qproform.hxx 2004-12-15 14:21:27.642350600 +0530 +@@ -0,0 +1,71 @@ ++#ifndef _QPROFORM_HXX ++#define _QPROFORM_HXX ++ ++#ifndef SC_XLTOOLS_HXX ++#include "xltools.hxx" ++#endif ++#ifndef _FORMEL_HXX ++#include "formel.hxx" ++#endif ++#ifndef _STRING_HXX ++#include <tools/string.hxx> ++#endif ++#ifndef _QPRO_HXX ++#include "qpro.hxx" ++#endif ++ ++enum FUNC_TYPE ++{ ++ FT_Return, ++ FT_FuncFix0, ++ FT_FuncFix1, ++ FT_FuncFix2, ++ FT_FuncFix3, ++ FT_FuncFix4, ++ FT_FuncVar, ++ FT_Neg, ++ FT_Op, ++ FT_NotImpl, ++ FT_ConstFloat, ++ FT_Variable, ++ FT_Range, ++ FT_Braces, ++ FT_ConstInt, ++ FT_ConstString, ++ FT_NOP, ++ FT_Cref, ++ FT_Rref, ++ FT_Nrref, ++ FT_Absnref, ++ FT_Erref, ++ FT_Ecref, ++ FT_Econstant, ++ FT_Splfunc, ++ FT_Const10Float, ++}; ++ ++class QProToSc : public QProConverterBase ++{ ++private: ++ TokenId nAddToken; ++ TokenId nSubToken; ++ TokenId n0Token; ++ ++ void ReadSRD( SingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); ++public: ++ QProToSc( BiffReader& aStr ); ++ ~QProToSc(){ }; ++ ConvErr Convert( const ScTokenArray*& rpErg, sal_uInt16 nLen, ++ const FORMULA_TYPE eFT = FT_CellFormula ); ++ void Reset( ScAddress aEingPos ); ++ void DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtString ); ++ ++ void IncToken( TokenId &rParam ); ++ void DecToken( TokenId& rParam ); ++ void NegToken( TokenId& rParam ); ++ DefTokenId IndexToToken( sal_uInt16 nToken ); ++ FUNC_TYPE IndexToType( sal_uInt8 nToken ); ++ const sal_Char* GetAddInName( const sal_uInt8 nId ); ++}; ++ ++#endif diff --git a/patches/OOO_1_1/rsc-default-to-english.diff b/patches/OOO_1_1/rsc-default-to-english.diff new file mode 100644 index 000000000..fd1913721 --- /dev/null +++ b/patches/OOO_1_1/rsc-default-to-english.diff @@ -0,0 +1,261 @@ +--- rsc/source/parser/rscdb.cxx.english-default 2004-12-08 16:17:45.000000000 -0500 ++++ rsc/source/parser/rscdb.cxx 2004-12-08 17:16:49.267795520 -0500 +@@ -766,6 +766,177 @@ + } + IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRcCtor, RscTop *, pRef ) + ++ ++// There's no good place to get this from... transex3/export.hxx isn't yet delivered, ++// and we can't create a ResMgr instance to use ResMgr::GetLang() because we don't ++// have a resource file at all yet. Seems like this stuff should be in the tools' ++// modules Language->ISO routines, but use of phone code #s is gone with 2.0 anyway, so... ++sal_Char* RscGetLang( LanguageType nType ) ++{ ++ switch ( nType ) ++ { ++ case LANGUAGE_DANISH: ++ return "45"; ++ ++ case LANGUAGE_DUTCH: ++ case LANGUAGE_DUTCH_BELGIAN: ++ return "31"; ++ ++ case LANGUAGE_ENGLISH: ++ case LANGUAGE_ENGLISH_UK: ++ case LANGUAGE_ENGLISH_EIRE: ++ case LANGUAGE_ENGLISH_SAFRICA: ++ case LANGUAGE_ENGLISH_JAMAICA: ++ case LANGUAGE_ENGLISH_BELIZE: ++ case LANGUAGE_ENGLISH_TRINIDAD: ++ case LANGUAGE_ENGLISH_ZIMBABWE: ++ case LANGUAGE_ENGLISH_PHILIPPINES: ++ return "44"; ++ ++ case LANGUAGE_ENGLISH_US: ++ case LANGUAGE_ENGLISH_CAN: ++ return "01"; ++ ++ case LANGUAGE_ENGLISH_AUS: ++ case LANGUAGE_ENGLISH_NZ: ++ return "61"; ++ case LANGUAGE_ESTONIAN: ++ return "77"; ++ ++ ++ case LANGUAGE_FINNISH: ++ return "35"; ++ ++ case LANGUAGE_FRENCH_CANADIAN: ++ return "02"; ++ ++ case LANGUAGE_FRENCH: ++ case LANGUAGE_FRENCH_BELGIAN: ++ case LANGUAGE_FRENCH_SWISS: ++ case LANGUAGE_FRENCH_LUXEMBOURG: ++ case LANGUAGE_FRENCH_MONACO: ++ return "33"; ++ ++ case LANGUAGE_GERMAN: ++ case LANGUAGE_GERMAN_SWISS: ++ case LANGUAGE_GERMAN_AUSTRIAN: ++ case LANGUAGE_GERMAN_LUXEMBOURG: ++ case LANGUAGE_GERMAN_LIECHTENSTEIN: ++ return "49"; ++ ++ case LANGUAGE_ITALIAN: ++ case LANGUAGE_ITALIAN_SWISS: ++ return "39"; ++ ++ case LANGUAGE_NORWEGIAN: ++ case LANGUAGE_NORWEGIAN_BOKMAL: ++ return "47"; ++ ++ case LANGUAGE_NORWEGIAN_NYNORSK: ++ return "79"; ++ ++ case LANGUAGE_PORTUGUESE: ++ return "03"; ++ ++ case LANGUAGE_PORTUGUESE_BRAZILIAN: ++ return "55"; ++ ++ case LANGUAGE_SPANISH: ++ case LANGUAGE_SPANISH_MEXICAN: ++ case LANGUAGE_SPANISH_MODERN: ++ case LANGUAGE_SPANISH_GUATEMALA: ++ case LANGUAGE_SPANISH_COSTARICA: ++ case LANGUAGE_SPANISH_PANAMA: ++ case LANGUAGE_SPANISH_DOMINICAN_REPUBLIC: ++ case LANGUAGE_SPANISH_VENEZUELA: ++ case LANGUAGE_SPANISH_COLOMBIA: ++ case LANGUAGE_SPANISH_PERU: ++ case LANGUAGE_SPANISH_ARGENTINA: ++ case LANGUAGE_SPANISH_ECUADOR: ++ case LANGUAGE_SPANISH_CHILE: ++ case LANGUAGE_SPANISH_URUGUAY: ++ case LANGUAGE_SPANISH_PARAGUAY: ++ case LANGUAGE_SPANISH_BOLIVIA: ++ return "34"; ++ ++ case LANGUAGE_SWEDISH: ++ return "46"; ++ ++ case LANGUAGE_POLISH: ++ return "48"; ++ case LANGUAGE_CZECH: ++ return "42"; ++ case LANGUAGE_SLOVENIAN: ++ return "50"; ++ case LANGUAGE_WELSH: ++ return "53"; ++ case LANGUAGE_HUNGARIAN: ++ return "36"; ++ case LANGUAGE_RUSSIAN: ++ return "07"; ++ case LANGUAGE_SLOVAK: ++ return "43"; ++ case LANGUAGE_GREEK: ++ return "30"; ++ case LANGUAGE_TURKISH: ++ return "90"; ++ ++ case LANGUAGE_CHINESE_SIMPLIFIED: ++ return "86"; ++ case LANGUAGE_CHINESE_TRADITIONAL: ++ return "88"; ++ case LANGUAGE_JAPANESE: ++ return "81"; ++ case LANGUAGE_KOREAN: ++ case LANGUAGE_KOREAN_JOHAB: ++ return "82"; ++ case LANGUAGE_THAI: ++ return "66"; ++ case LANGUAGE_HINDI: ++ return "91"; ++ case LANGUAGE_TAMIL: ++ return "92"; ++ case LANGUAGE_GUJARATI: ++ return "94"; ++ ++ case LANGUAGE_ARABIC: ++ case LANGUAGE_ARABIC_IRAQ: ++ case LANGUAGE_ARABIC_EGYPT: ++ case LANGUAGE_ARABIC_LIBYA: ++ case LANGUAGE_ARABIC_ALGERIA: ++ case LANGUAGE_ARABIC_MOROCCO: ++ case LANGUAGE_ARABIC_TUNISIA: ++ case LANGUAGE_ARABIC_OMAN: ++ case LANGUAGE_ARABIC_YEMEN: ++ case LANGUAGE_ARABIC_SYRIA: ++ case LANGUAGE_ARABIC_JORDAN: ++ case LANGUAGE_ARABIC_LEBANON: ++ case LANGUAGE_ARABIC_KUWAIT: ++ case LANGUAGE_ARABIC_UAE: ++ case LANGUAGE_ARABIC_BAHRAIN: ++ case LANGUAGE_ARABIC_QATAR: ++ return "96"; ++ ++ case LANGUAGE_HEBREW: ++ return "97"; ++ ++ case LANGUAGE_CATALAN: ++ return "37"; ++ ++ case LANGUAGE_NORTHERNSOTHO: ++ return "26"; ++ ++ case LANGUAGE_AFRIKAANS: ++ return "27"; ++ ++ case LANGUAGE_ZULU: ++ return "28"; ++ ++ default: ++ return "99"; ++ } ++} ++ + /************************************************************************* + |* + |* RscTypCont :: WriteRc +@@ -795,7 +966,31 @@ + { + UniString aUniFileName( pSysEntry->aFileName, RTL_TEXTENCODING_ASCII_US ); + DirEntry aFullName( aUniFileName ); +- aFullName.Find( UniString( GetSysSearchPath(), RTL_TEXTENCODING_ASCII_US ) ); ++ ++ if (!aFullName.Find( UniString( GetSysSearchPath(), RTL_TEXTENCODING_ASCII_US ) ) ++ && (aUniFileName.SearchAscii(".bmp") != STRING_NOTFOUND)) ++ { ++ // Ok, if that didn't get found, lets try adding the language # before the file ++ // extension if its a bitmap. Sometimes the file will be specified as "un_op.bmp" ++ // when what we really want is "un_op01.bmp" or "un_op33.bmp" ++ sal_Char *pLang = RscGetLang (nLangTypeId); ++ if (!pLang) ++ pLang = RscGetLang (nDfltLangTypeId); ++ if (!pLang) ++ pLang = ""; ++ ByteString aTmp (pLang); ++ aTmp.Append (".bmp"); ++ UniString aNewExt (aTmp, RTL_TEXTENCODING_ASCII_US); ++ ++ aUniFileName.SearchAndReplaceAscii (".bmp", aNewExt); ++ aFullName.SetName (aUniFileName); ++ if (!aFullName.Find( UniString( GetSysSearchPath(), RTL_TEXTENCODING_ASCII_US ) )) ++ { ++ aUniFileName.AssignAscii (pSysEntry->aFileName.GetBuffer()); ++ aFullName.SetName (aUniFileName); ++ } ++ } ++ + pSysEntry->aFileName = ByteString( aFullName.GetFull(), RTL_TEXTENCODING_ASCII_US ); + #if OSL_DEBUG_LEVEL > 1 + fprintf( stderr, "found sys dep file %s\n", pSysEntry->aFileName.GetBuffer() ); +--- rsc/source/res/rscmgr.cxx.default-english 2004-12-07 21:39:08.071066736 -0500 ++++ rsc/source/res/rscmgr.cxx 2004-12-07 21:48:48.271862808 -0500 +@@ -303,6 +303,11 @@ + LanguageType aOldDefLanguage = LANGUAGE_DONTKNOW; + if( pTC && rInst.IsInst() ) + { ++ /* Change default language to English (instead of German) so that ++ * incomplete translations aren't smattered with German. ++ */ ++ pTC->ChangeDefLanguage( LANGUAGE_ENGLISH_US ); ++ + /* + * if language is different than german and rInst + * is of type Accelerator then tweak the default +--- rsc/source/res/rscarray.cxx.default-english 2004-12-07 21:49:22.321686448 -0500 ++++ rsc/source/res/rscarray.cxx 2004-12-07 21:51:26.103868696 -0500 +@@ -621,7 +621,11 @@ + { + pNode = pClassData->pNode->Search( *pWriteTypeValue ); + if( !pNode && *pWriteTypeValue != *pWriteDfltTypeValue ) ++ { + pNode = pClassData->pNode->Search( *pWriteDfltTypeValue ); ++ if( !pNode && *pWriteTypeValue != *pWriteDfltTypeValue ) ++ pNode = pClassData->pNode->Search( LANGUAGE_ENGLISH ); ++ } + } + + if( pNode ) +--- solenv/inc/postset.mk.english-default 2004-12-08 15:21:33.000000000 -0500 ++++ solenv/inc/postset.mk 2004-12-08 15:21:56.000000000 -0500 +@@ -73,7 +73,7 @@ + rescharset_49=$(deut$(LANG_GUI)) + RCLANGFLAGS_49+= -d GERMAN + iso_49=de +-defaultlangext=49 ++defaultlangext=01 + #.ENDIF + + .IF "$(RES_ENUS)"!="" || "$(give_me_all_languages)"!="" +@@ -88,7 +88,7 @@ + rescharset_01=$(enus$(LANG_GUI)) + RCLANGFLAGS_01+= -d ENGLISH + iso_01=en-US +-#defaultlangext=01 ++defaultlangext=01 + + .IF "$(RES_ITAL)"!="" || "$(give_me_all_languages)"!="" + alllangext+=39 diff --git a/patches/OOO_1_1/s390-LINK-is-CC.diff b/patches/OOO_1_1/s390-LINK-is-CC.diff new file mode 100644 index 000000000..bce4533f2 --- /dev/null +++ b/patches/OOO_1_1/s390-LINK-is-CC.diff @@ -0,0 +1,16 @@ +Index: unxlngs3904.mk +=================================================================== +RCS file: /cvs/tools/solenv/inc/unxlngs3904.mk,v +retrieving revision 1.4.26.1 +diff -u -u -r1.4.26.1 unxlngs3904.mk +--- solenv/inc/unxlngs3904.mk 9 Jan 2004 18:59:15 -0000 1.4.26.1 ++++ solenv/inc/unxlngs3904.mk 16 Aug 2005 21:32:03 -0000 +@@ -153,7 +153,7 @@ + DYNAMIC = -Wl,-Bdynamic + + # name of linker +-LINK*=g++-3.2 ++LINK*=$(CC) + # default linker flags + LINKFLAGS= + diff --git a/patches/OOO_1_1/sc-filters-fill-fix.diff b/patches/OOO_1_1/sc-filters-fill-fix.diff new file mode 100644 index 000000000..9523c6924 --- /dev/null +++ b/patches/OOO_1_1/sc-filters-fill-fix.diff @@ -0,0 +1,20 @@ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/core/data/table4.cxx 2003-03-26 23:34:00.000000000 +0530 ++++ sc/source/core/data/table4.cxx 2004-10-14 11:12:38.050393488 +0530 +@@ -1286,6 +1286,8 @@ + { + for (rInner = nIMin; rInner <= nIMax; rInner++) + { ++ if (pDocument->RowFiltered( rInner, nTab)) ++ continue; + USHORT nInd = nActFormCnt; + FillFormula(nInd, bFirst, (ScFormulaCell*)pSrcCell, + nCol, nRow, (rInner == nIEnd) ); +@@ -1297,6 +1299,8 @@ + { + for (rInner = nIMin; rInner <= nIMax; rInner++) + { ++ if (pDocument->RowFiltered( rInner, nTab)) ++ continue; + aCol[nCol].Insert(nRow, pSrcCell->Clone(pDocument)); + } + nProgress += nIMax - nIMin + 1; diff --git a/patches/OOO_1_1/sc-standard-filter-options.diff b/patches/OOO_1_1/sc-standard-filter-options.diff new file mode 100644 index 000000000..676d97b2d --- /dev/null +++ b/patches/OOO_1_1/sc-standard-filter-options.diff @@ -0,0 +1,362 @@ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/inc/global.hxx 2003-04-28 21:00:46.000000000 +0530 ++++ sc/inc/global.hxx 2004-10-08 16:23:48.000000000 +0530 +@@ -1329,6 +1329,8 @@ + + enum ScQueryOp + { ++ SC_BEGINS_WITH, ++ SC_ENDS_WITH, + SC_EQUAL, + SC_LESS, + SC_GREATER, +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/filtdlg.cxx 2004-01-09 20:11:10.000000000 +0530 ++++ sc/source/ui/dbgui/filtdlg.cxx 2004-10-08 16:24:56.000000000 +0530 +@@ -83,6 +83,7 @@ + #include "viewdata.hxx" + #include "document.hxx" + #include "scresid.hxx" ++#include "docoptio.hxx" + + #include "foptmgr.hxx" + +@@ -219,6 +220,7 @@ + aBtnMore, + aBtnCase, + aBtnRegExp, ++ aBtnWholeWord, + aBtnHeader, + aBtnUnique, + aBtnCopyResult, +@@ -573,6 +575,17 @@ + bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) ); + } + ++ /* ++ * The reg exp checkbutton read is moved up, since, ++ * for begins and ends with query we are makeing them as re query transparently ++ * Checking this later spoils the entire transparent work. ++ */ ++ theParam.bRegExp = aBtnRegExp.IsChecked(); ++ ++ ScDocOptions pDocOpts = pDoc->GetDocOptions(); ++ pDocOpts.SetMatchWholeCell(aBtnWholeWord.IsChecked()); ++ pDoc->SetDocOptions(pDocOpts); ++ + for ( USHORT i=0; i<3; i++ ) + { + USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); +@@ -606,6 +619,19 @@ + } + else + { ++ if (eOp == SC_BEGINS_WITH ) { ++ String tmp ('^'); ++ tmp .Append(aStrVal); ++ ::rtl::OUString str (tmp); ++ aStrVal.Assign(tmp); ++ eOp = SC_EQUAL; ++ theParam.bRegExp = TRUE; ++ } ++ else if (eOp == SC_ENDS_WITH ) { ++ aStrVal.Append (String('$')); ++ eOp = SC_EQUAL; ++ theParam.bRegExp = TRUE; ++ } + *rEntry.pStr = aStrVal; + rEntry.nVal = 0; + rEntry.bQueryByString = TRUE; +@@ -642,7 +668,7 @@ + theParam.bByRow = TRUE; + theParam.bDuplicate = !aBtnUnique.IsChecked(); + theParam.bCaseSens = aBtnCase.IsChecked(); +- theParam.bRegExp = aBtnRegExp.IsChecked(); ++ + theParam.bDestPers = aBtnDestPers.IsChecked(); + + // nur die drei eingestellten - alles andere zuruecksetzen +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filtdlg.hxx 2001-09-24 22:59:58.000000000 +0530 ++++ sc/source/ui/inc/filtdlg.hxx 2004-10-08 12:23:49.000000000 +0530 +@@ -101,6 +101,7 @@ + CheckBox aBtnCase; \ + CheckBox aBtnRegExp; \ + CheckBox aBtnHeader; \ ++ CheckBox aBtnWholeWord; \ + CheckBox aBtnUnique; \ + CheckBox aBtnCopyResult; \ + ListBox aLbCopyArea; \ +@@ -122,6 +123,7 @@ + aFlOptions ( this, ScResId( FL_OPTIONS ) ), \ + aBtnCase ( this, ScResId( BTN_CASE ) ), \ + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ ++ aBtnWholeWord ( this, ScResId( BTN_MATCH) ), \ + aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ + aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/filter.hrc 2001-05-21 14:52:56.000000000 +0530 ++++ sc/source/ui/inc/filter.hrc 2004-10-08 12:27:21.000000000 +0530 +@@ -81,7 +81,7 @@ + #define FT_DBAREA_LABEL 10 + #define FT_DBAREA 11 + #define BTN_DEST_PERS 12 +- ++#define BTN_MATCH 13 + // Filter: + #define FT_OP 20 + #define FT_FIELD 21 +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/src/filter.src 2004-04-27 22:31:47.000000000 +0530 ++++ sc/source/ui/src/filter.src 2004-10-08 14:55:38.000000000 +0530 +@@ -66,7 +66,7 @@ + HelpId = SID_FILTER ; + Hide = TRUE ; + SVLook = TRUE ; +- Size = MAP_APPFONT ( 298 , 83 ) ; ++ Size = MAP_APPFONT ( 298 , 98 ) ; + Text = "Standardfilter" ; + Text [ ENGLISH ] = "Standard Filter" ; + Text [ norwegian ] = "Standardfilter" ; +@@ -708,12 +708,14 @@ + }; + stringlist [ english_us ] = + { +- < "=" ; Default ; > ; ++ < "Begins with" ; Default ; > ; ++ < "Ends with" ; Default ; > ; ++ < "Equals" ; Default ; > ; + < "<" ; Default ; > ; + < ">" ; Default ; > ; + < "<=" ; Default ; > ; + < ">=" ; Default ; > ; +- < "<>" ; Default ; > ; ++ < "Not equals" ; Default ; > ; + < "Largest" ; Default ; > ; + < "Smallest" ; Default ; > ; + < "Largest %" ; Default ; > ; +@@ -2278,6 +2280,14 @@ + Text[ zulu ] = "Isisho esi~jwayelekile"; + Text[ norwegian_nynorsk ] = "~Regulrt uttrykk"; + }; ++ ++ CheckBox BTN_MATCH ++ { ++ Pos = MAP_APPFONT ( 12 , 126 ) ; ++ Size = MAP_APPFONT ( 239 , 10 ) ; ++ Text [ english_us ] = "Search criteria must apply to ~whole cells" ; ++ }; ++ + CheckBox BTN_HEADER + { + Hide = TRUE ; +@@ -2458,7 +2468,7 @@ + { + Border = TRUE ; + Hide = TRUE ; +- Pos = MAP_APPFONT ( 21 , 126 ) ; ++ Pos = MAP_APPFONT ( 21 , 138 ) ; + Size = MAP_APPFONT ( 90 , 90 ) ; + TabStop = TRUE ; + DropDown = TRUE ; +@@ -2467,7 +2477,7 @@ + { + Border = TRUE ; + Hide = TRUE ; +- Pos = MAP_APPFONT ( 115 , 126 ) ; ++ Pos = MAP_APPFONT ( 115 , 138 ) ; + Size = MAP_APPFONT ( 104 , 12 ) ; + TabStop = TRUE ; + }; +@@ -2475,7 +2485,7 @@ + { + QuickHelpText = "Verkleinern" ; + QuickHelpText [ ENGLISH ] = "Shrink" ; +- Pos = MAP_APPFONT ( 221 , 126 ) ; ++ Pos = MAP_APPFONT ( 221 , 138 ) ; + Size = MAP_APPFONT ( 12 , 12 ) ; + TabStop = FALSE ; + QuickHelpText [ english_us ] = "Shrink" ; +@@ -2605,7 +2615,7 @@ + FixedText FT_DBAREA_LABEL + { + Hide = TRUE ; +- Pos = MAP_APPFONT ( 6 , 144 ) ; ++ Pos = MAP_APPFONT ( 6 , 156 ) ; + Size = MAP_APPFONT ( 58 , 8 ) ; + Text = "Datenbereich:" ; + Text [ ENGLISH ] = "Data area:" ; +@@ -3204,10 +3214,10 @@ + Text [ danish ] = "dummy" ; + Text [ french ] = "factice" ; + Text [ swedish ] = "dummy" ; ++ Left = TRUE ; + Text [ dutch ] = "dummy" ; + Text [ spanish ] = "Texto ejemplo" ; + Text [ english_us ] = "dummy" ; +- Left = TRUE ; + Text[ chinese_simplified ] = "样本"; + Text[ russian ] = ""; + Text[ polish ] = "Zalepka"; +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/dbgui/foptmgr.cxx 2001-10-23 14:35:11.000000000 +0530 ++++ sc/source/ui/dbgui/foptmgr.cxx 2004-10-08 16:04:15.000000000 +0530 +@@ -76,6 +76,7 @@ + #include "dbcolect.hxx" + #include "viewdata.hxx" + #include "document.hxx" ++#include "docoptio.hxx" + + #define _FOPTMGR_CXX + #include "foptmgr.hxx" +@@ -111,6 +111,7 @@ + rBtnMore ( refBtnMore ), + rBtnCase ( refBtnCase ), + rBtnRegExp ( refBtnRegExp ), ++ rBtnWholeWord ( refBtnRegExp ), + rBtnHeader ( refBtnHeader ), + rBtnUnique ( refBtnUnique ), + rBtnCopyResult ( refBtnCopyResult ), +@@ -123,9 +124,53 @@ + rStrNoName ( refStrNoName ), + rStrUndefined ( refStrUndefined ) + { +- Init(); ++ Init(FALSE); + } + ++ScFilterOptionsMgr::ScFilterOptionsMgr( ++ Dialog* ptrDlg, ++ ScViewData* ptrViewData, ++ const ScQueryParam& refQueryData, ++ MoreButton& refBtnMore, ++ CheckBox& refBtnCase, ++ CheckBox& refBtnRegExp, ++ CheckBox& refBtnWholeWord, ++ CheckBox& refBtnHeader, ++ CheckBox& refBtnUnique, ++ CheckBox& refBtnCopyResult, ++ CheckBox& refBtnDestPers, ++ ListBox& refLbCopyArea, ++ Edit& refEdCopyArea, ++ ScRefButton& refRbCopyArea, ++ FixedText& refFtDbAreaLabel, ++ FixedInfo& refFtDbArea, ++ FixedLine& refFlOptions, ++ const String& refStrNoName, ++ const String& refStrUndefined ) ++ ++ : pDlg ( ptrDlg ), ++ pViewData ( ptrViewData ), ++ pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ), ++ rQueryData ( refQueryData ), ++ rBtnMore ( refBtnMore ), ++ rBtnCase ( refBtnCase ), ++ rBtnRegExp ( refBtnRegExp ), ++ rBtnWholeWord ( refBtnWholeWord), ++ rBtnHeader ( refBtnHeader ), ++ rBtnUnique ( refBtnUnique ), ++ rBtnCopyResult ( refBtnCopyResult ), ++ rBtnDestPers ( refBtnDestPers ), ++ rLbCopyPos ( refLbCopyArea ), ++ rEdCopyPos ( refEdCopyArea ), ++ rRbCopyPos ( refRbCopyArea ), ++ rFtDbAreaLabel ( refFtDbAreaLabel ), ++ rFtDbArea ( refFtDbArea ), ++ rFlOptions ( refFlOptions ), ++ rStrNoName ( refStrNoName ), ++ rStrUndefined ( refStrUndefined ) ++{ ++ Init(TRUE); ++} + + //---------------------------------------------------------------------------- + +@@ -141,7 +186,7 @@ + + //---------------------------------------------------------------------------- + +-void ScFilterOptionsMgr::Init() ++void ScFilterOptionsMgr::Init(BOOL param) + { + DBG_ASSERT( pViewData && pDoc, "Init failed :-/" ); + +@@ -151,6 +196,8 @@ + + rBtnMore.AddWindow( &rBtnCase ); + rBtnMore.AddWindow( &rBtnRegExp ); ++ if (param) ++ rBtnMore.AddWindow(&rBtnWholeWord); + rBtnMore.AddWindow( &rBtnHeader ); + rBtnMore.AddWindow( &rBtnUnique ); + rBtnMore.AddWindow( &rBtnCopyResult ); +@@ -160,13 +207,18 @@ + rBtnMore.AddWindow( &rRbCopyPos ); + rBtnMore.AddWindow( &rFtDbAreaLabel ); + rBtnMore.AddWindow( &rFtDbArea ); +- rBtnMore.AddWindow( &rFlOptions ); ++ rBtnMore.AddWindow( &rFlOptions ); ++ + + rBtnCase .Check( rQueryData.bCaseSens ); + rBtnHeader .Check( rQueryData.bHasHeader ); + rBtnRegExp .Check( rQueryData.bRegExp ); + rBtnUnique .Check( !rQueryData.bDuplicate ); +- ++ if (param) { ++ BOOL bMatchWholeCell = pDoc->GetDocOptions().IsMatchWholeCell(); ++ rBtnWholeWord.Check(bMatchWholeCell); ++ } ++ + if ( pViewData && pDoc ) + { + String theAreaStr; +@@ -266,6 +318,7 @@ + } + else + rEdCopyPos.SetText( EMPTY_STRING ); ++ rFtDbArea.SetPosPixel(Point(158,331)); + } + + +--- /home/sragavan/cvs/bk/ooo-build/build/OOO_1_1_2/sc/source/ui/inc/foptmgr.hxx 2001-05-21 14:52:56.000000000 +0530 ++++ sc/source/ui/inc/foptmgr.hxx 2004-10-08 16:02:56.000000000 +0530 +@@ -108,6 +108,26 @@ + FixedLine& refFlOptions, + const String& refStrNoName, + const String& refStrUndefined ); ++ ScFilterOptionsMgr( Dialog* ptrDlg, ++ ScViewData* ptrViewData, ++ const ScQueryParam& refQueryData, ++ MoreButton& refBtnMore, ++ CheckBox& refBtnCase, ++ CheckBox& refBtnRegExp, ++ CheckBox& refBtnWholeWord, ++ CheckBox& refBtnHeader, ++ CheckBox& refBtnUnique, ++ CheckBox& refBtnCopyResult, ++ CheckBox& refBtnDestPers, ++ ListBox& refLbCopyArea, ++ Edit& refEdCopyArea, ++ ScRefButton& refRbCopyArea, ++ FixedText& refFtDbAreaLabel, ++ FixedInfo& refFtDbArea, ++ FixedLine& refFlOptions, ++ const String& refStrNoName, ++ const String& refStrUndefined ); ++ + ~ScFilterOptionsMgr(); + + BOOL VerifyPosStr ( const String& rPosStr ) const; +@@ -119,6 +139,7 @@ + + MoreButton& rBtnMore; + CheckBox& rBtnCase; ++ CheckBox& rBtnWholeWord; + CheckBox& rBtnRegExp; + CheckBox& rBtnHeader; + CheckBox& rBtnUnique; +@@ -138,7 +159,7 @@ + + #ifdef _FOPTMGR_CXX + private: +- void Init(); ++ void Init(BOOL param); + + // Handler: + DECL_LINK( EdPosModifyHdl, Edit* ); diff --git a/patches/OOO_1_1/sd-export-html-translations.diff b/patches/OOO_1_1/sd-export-html-translations.diff index 788cd7d9f..b88bb504a 100644 --- a/patches/OOO_1_1/sd-export-html-translations.diff +++ b/patches/OOO_1_1/sd-export-html-translations.diff @@ -1,12 +1,9 @@ -Index: source/filter/html/pubdlg.src +Index: sd/source/filter/html/pubdlg.src =================================================================== -RCS file: /cvs/graphics/sd/source/filter/html/pubdlg.src,v -retrieving revision 1.13.14.4 -diff -u -r1.13.14.4 pubdlg.src ---- sd/source/filter/html/pubdlg.src 27 Apr 2004 16:42:59 -0000 1.13.14.4 -+++ sd/source/filter/html/pubdlg.src 9 Jun 2004 04:36:11 -0000 -@@ -1357,47 +1357,47 @@ - Text[ norwegian_nynorsk ] = "Lagra bilete som"; +--- sd/source/filter/html/pubdlg.src.orig 2004-09-09 20:18:37.000000000 +0200 ++++ sd/source/filter/html/pubdlg.src 2004-09-12 14:19:41.194859600 +0200 +@@ -1487,52 +1487,52 @@ ModalDialog DLG_PUBLISHING + Text[ galician ] = "Save graphics as"; }; - RadioButton PAGE3_GIF @@ -14,7 +11,7 @@ diff -u -r1.13.14.4 pubdlg.src { Pos = MAP_APPFONT( 12, 49 ); Size = MAP_APPFONT( 116, 10 ); - Text = "~GIF"; +- Text = "~GIF"; - Text [ ENGLISH ] = "~GIF"; - Text[ italian ] = "~GIF"; - Text[ portuguese_brazilian ] = "~GIF"; @@ -32,8 +29,8 @@ diff -u -r1.13.14.4 pubdlg.src - Text[ greek ] = "~GIF - Graphics Interchange Format"; - Text[ korean ] = "~GIF"; - Text[ chinese_traditional ] = "~GIF"; -- Text[ arabic ] = "GIF - Graphics Interchange-Format"; -- Text[ turkish ] = "~GIF"; +- Text[ arabic ] = "~GIF"; +- Text[ turkish ] = "GIF"; - Text[ catalan ] = "~GIF"; - Text[ finnish ] = "~GIF"; - Text[ thai ] = "~GIF - Graphics Interchange Format"; @@ -51,6 +48,12 @@ diff -u -r1.13.14.4 pubdlg.src - Text[ afrikaans ] = "~GIF"; - Text[ zulu ] = "~GIF"; - Text[ norwegian_nynorsk ] = "~GIF"; +- Text[ tswana ] = "~GIF"; +- Text[ basque ] = "~GIF"; +- Text[ lithuanian ] = "~GIF"; +- Text[ kannada ] = "GIF"; +- Text[ galician ] = "~GIF"; ++ Text = "~PNG"; + Text [ ENGLISH ] = "~PNG"; + Text[ italian ] = "~PNG"; + Text[ portuguese_brazilian ] = "~PNG"; @@ -68,8 +71,8 @@ diff -u -r1.13.14.4 pubdlg.src + Text[ greek ] = "~PNG"; + Text[ korean ] = "~PNG"; + Text[ chinese_traditional ] = "~PNG"; -+ Text[ arabic ] = "PNG"; -+ Text[ turkish ] = "~PNG"; ++ Text[ arabic ] = "~PNG"; ++ Text[ turkish ] = "PNG"; + Text[ catalan ] = "~PNG"; + Text[ finnish ] = "~PNG"; + Text[ thai ] = "~PNG"; @@ -87,6 +90,11 @@ diff -u -r1.13.14.4 pubdlg.src + Text[ afrikaans ] = "~PNG"; + Text[ zulu ] = "~PNG"; + Text[ norwegian_nynorsk ] = "~PNG"; ++ Text[ tswana ] = "~PNG"; ++ Text[ basque ] = "~PNG"; ++ Text[ lithuanian ] = "~PNG"; ++ Text[ kannada ] = "PNG"; ++ Text[ galician ] = "~PNG"; }; RadioButton PAGE3_JPG diff --git a/patches/OOO_1_1/sd-slide-sorter-selector.diff b/patches/OOO_1_1/sd-slide-sorter-selector.diff new file mode 100644 index 000000000..fc8abd4b2 --- /dev/null +++ b/patches/OOO_1_1/sd-slide-sorter-selector.diff @@ -0,0 +1,48 @@ +--- sd/source/ui/func/fuslsel.cxx 2003-03-27 16:27:51.000000000 +0530 ++++ sd/source/ui/func/fuslsel.cxx 2004-12-10 11:33:40.395794208 +0530 +@@ -165,9 +165,34 @@ + { + bPageHit = TRUE; // Seite getroffen, merken fuer MouseMove + +- if (rMEvt.IsShift()) ++ if( rMEvt.IsMod1() ) + pSlView->Select( ( pHitPage->GetPageNum() - 1 ) / 2, !pHitPage->IsSelected() ); +- else if( !pHitPage->IsSelected() ) ++ else if( rMEvt.IsShift() ) ++ { ++ USHORT nCurrentPage = ( pHitPage->GetPageNum() - 1 ) / 2; ++ USHORT nPageRange; ++ BOOL bFound = FALSE; ++ for (nPageRange = 0; nPageRange < nNoOfPages; nPageRange++) ++ { ++ SdPage* pTestPage = pDoc->GetSdPage(nPageRange, PK_STANDARD); ++ if( pTestPage->IsSelected() ) ++ { ++ bFound = TRUE; ++ break; ++ } ++ } ++ if( !bFound ) ++ pSlView->Select( nCurrentPage, TRUE ); ++ else if( nCurrentPage != nPageRange ) ++ { ++ for (nPage = ((nCurrentPage > nPageRange) ? nPageRange : nCurrentPage); ++ nPage <= ((nCurrentPage > nPageRange) ? nCurrentPage : nPageRange); ++ nPage++) ++ pSlView->Select( nPage, TRUE ); ++ } ++ ++ } ++ else + { + // einfache Selektion, alle selektierten deselektieren, getroffene Seite selektieren + pSlView->SelectAll( FALSE ); +@@ -207,7 +232,7 @@ + if( !pHitPage && !bReturn ) + { + // keine erweiterte Selektion: alle Seiten deselektieren +- if( !rMEvt.IsShift() ) ++ if( !rMEvt.IsShift() && !rMEvt.IsMod1() ) + pSlView->SelectAll( FALSE ); + + bDragSelection = TRUE; diff --git a/patches/OOO_1_1/svx-default-font-tracks-LANGUAGE_SYSTEM.diff b/patches/OOO_1_1/svx-default-font-tracks-LANGUAGE_SYSTEM.diff new file mode 100644 index 000000000..c226c9710 --- /dev/null +++ b/patches/OOO_1_1/svx-default-font-tracks-LANGUAGE_SYSTEM.diff @@ -0,0 +1,75 @@ +Index: svx/source/items/textitem.cxx +=================================================================== +RCS file: /cvs/graphics/svx/source/items/textitem.cxx,v +retrieving revision 1.52 +diff -u -p -r1.52 textitem.cxx +--- svx/source/items/textitem.cxx 17 Apr 2003 09:57:58 -0000 1.52 ++++ svx/source/items/textitem.cxx 9 Dec 2004 11:43:56 -0000 +@@ -3704,24 +3704,21 @@ void GetDefaultFonts( SvxFontItem& rLati + { + const USHORT nItemCnt = 3; + +- static struct ++ USHORT aOutTypeArr[ nItemCnt ] = + { +- USHORT nFontType; +- USHORT nLanguage; +- } +- aOutTypeArr[ nItemCnt ] = +- { +- { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US }, +- { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US }, +- { DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA } ++ DEFAULTFONT_LATIN_TEXT, ++ DEFAULTFONT_CJK_TEXT, ++ DEFAULTFONT_CTL_TEXT + }; + ++ LanguageType eLanguage = Application::GetSettings().GetLanguage(); ++ + SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex }; + + for ( USHORT n = 0; n < nItemCnt; ++n ) + { +- Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType, +- aOutTypeArr[ n ].nLanguage, ++ Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ], ++ eLanguage, + DEFAULTFONT_FLAGS_ONLYONE, 0 ) ); + SvxFontItem* pItem = aItemArr[ n ]; + pItem->GetFamily() = aFont.GetFamily(); +Index: svx/source/svdraw/svdmodel.cxx +=================================================================== +RCS file: /cvs/graphics/svx/source/svdraw/svdmodel.cxx,v +retrieving revision 1.48 +diff -u -p -r1.48 svdmodel.cxx +--- svx/source/svdraw/svdmodel.cxx 24 Apr 2003 16:42:29 -0000 1.48 ++++ svx/source/svdraw/svdmodel.cxx 9 Dec 2004 11:44:19 -0000 +@@ -935,19 +935,20 @@ void SdrModel::SetTextDefaults() const + void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex) + { + const USHORT nItemCnt = 3; +- static struct { +- USHORT nFntType, nLanguage; +- } aOutTypeArr[ nItemCnt ] = { +- { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US }, +- { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US }, +- { DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA } ++ USHORT aOutTypeArr[ nItemCnt ] = ++ { ++ DEFAULTFONT_LATIN_TEXT, ++ DEFAULTFONT_CJK_TEXT, ++ DEFAULTFONT_CTL_TEXT + }; ++ ++ LanguageType eLanguage = Application::GetSettings().GetLanguage(); + SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex }; + + for( USHORT n = 0; n < nItemCnt; ++n ) + { + Font aFnt( OutputDevice::GetDefaultFont( +- aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage, ++ aOutTypeArr[ n ], eLanguage, + DEFAULTFONT_FLAGS_ONLYONE, 0 )); + SvxFontItem* pI = aItemArr[ n ]; + pI->GetFamily() = aFnt.GetFamily(); diff --git a/patches/OOO_1_1/sw-online-layout-crash-fix.diff b/patches/OOO_1_1/sw-online-layout-crash-fix.diff new file mode 100644 index 000000000..5e80568bd --- /dev/null +++ b/patches/OOO_1_1/sw-online-layout-crash-fix.diff @@ -0,0 +1,19 @@ +Index: source/core/layout/fly.cxx +=================================================================== +RCS file: /cvs/sw/sw/source/core/layout/fly.cxx,v +retrieving revision 1.46.52.3 +diff -u -p -r1.46.52.3 fly.cxx +--- sw/source/core/layout/fly.cxx 28 Apr 2004 10:29:47 -0000 1.46.52.3 ++++ sw/source/core/layout/fly.cxx 5 Nov 2004 11:15:08 -0000 +@@ -1695,8 +1695,9 @@ void SwFlyFrm::MakeFlyPos() + const long nBottom = GetAnchor()->Frm().Top() + aRelPos.Y() + Frm().Height(); + if ( nAnchorBottom < nBottom ) + { +- ((SwPageFrm*)GetAnchor())->FindBodyCont()-> +- Grow( nBottom - nAnchorBottom PHEIGHT ); ++ if (SwPageFrm *pOne = ((SwPageFrm*)GetAnchor())) ++ if (SwLayoutFrm *pTwo = pOne->FindBodyCont()) ++ pTwo->Grow( nBottom - nAnchorBottom PHEIGHT ); + } + } + diff --git a/patches/OOO_1_1/tools-options-pt_BR-fix.diff b/patches/OOO_1_1/tools-options-pt_BR-fix.diff new file mode 100644 index 000000000..28e50fe49 --- /dev/null +++ b/patches/OOO_1_1/tools-options-pt_BR-fix.diff @@ -0,0 +1,33 @@ +Index: offmgr/source/offapp/dialog/treeopt.src +=================================================================== +RCS file: /cvs/framework/offmgr/source/offapp/dialog/Attic/treeopt.src,v +retrieving revision 1.132.10.4 +diff -u -p -r1.132.10.4 treeopt.src +--- offmgr/source/offapp/dialog/treeopt.src 27 Apr 2004 16:17:20 -0000 1.132.10.4 ++++ offmgr/source/offapp/dialog/treeopt.src 9 Nov 2004 10:07:12 -0000 +@@ -902,16 +902,16 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES + < "%PRODUCTNAME" ; 0; > ; + < "Dados de utilizador" ; RID_SFXPAGE_GENERAL; > ; + < "Geral" ; OFA_TP_MISC; > ; +- < "Ver" ; OFA_TP_MEMORY; > ; +- < "Imprimir" ; OFA_TP_VIEW ; > ; +- < "Programas auxiliares" ; RID_SFXPAGE_PRINTOPTIONS; > ; +- < "Atalhos" ; OFA_TP_HELPERPROG; > ; +- < "Cores" ; RID_SFXPAGE_PATH; > ; +- < "Substituio de caracteres" ; RID_SVXPAGE_COLOR; > ; +- < "Segurana" ; RID_SVX_FONT_SUBSTITUTION ; > ; ++ < "Memria" ; OFA_TP_MEMORY; > ; ++ < "Ver" ; OFA_TP_VIEW; > ; ++ < "Imprimir" ; RID_SFXPAGE_PRINTOPTIONS; > ; ++ < "Programas auxiliares" ; OFA_TP_HELPERPROG; > ; ++ < "Atalhos" ; RID_SFXPAGE_PATH; > ; ++ < "Cores" ; RID_SVXPAGE_COLOR; > ; ++ < "Substituio de caracteres" ; RID_SVX_FONT_SUBSTITUTION; > ; + < "Segurana" ; RID_SVXPAGE_INET_SCRIPTING ; > ; +- < "Java" ; RID_SVXPAGE_COLORCONFIG ; > ; +- < "Outros" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ; ++ < "Aparncia" ; RID_SVXPAGE_COLORCONFIG ; > ; ++ < "Acessibilidade" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ; + < "Netzwerkidentitt" ; RID_SVXPAGE_SSO ; > ; + }; + ItemList [ russian ] = diff --git a/patches/OOO_1_1/vfs-uno-uri.diff b/patches/OOO_1_1/vfs-uno-uri.diff index fe97bf3ac..e0f1e4e43 100644 --- a/patches/OOO_1_1/vfs-uno-uri.diff +++ b/patches/OOO_1_1/vfs-uno-uri.diff @@ -5,11 +5,13 @@ retrieving revision 1.26.46.1 diff -u -p -r1.26.46.1 static.mk --- tools/bootstrp/static.mk 28 Jan 2004 10:54:08 -0000 1.26.46.1 +++ tools/bootstrp/static.mk 26 Aug 2004 15:01:26 -0000 -@@ -141,6 +141,7 @@ STATIC_LIBS += -lX11 -lXext +@@ -141,6 +141,9 @@ STATIC_LIBS += -lX11 -lXext .ELSE STATIC_LIBS += -lsupc++ -lX11 -lXext .ENDIF ++.IF "$(USE_GNOMEVFS)" == "TRUE" +STATIC_LIBS += `pkg-config --libs gnome-vfs-2.0` ++.ENDIF .ENDIF # ----------------------------------------------------------- @@ -20,11 +22,14 @@ retrieving revision 1.7 diff -u -p -r1.7 makefile.mk --- tools/source/fsys/makefile.mk 30 Apr 2003 08:25:46 -0000 1.7 +++ tools/source/fsys/makefile.mk 26 Aug 2004 15:01:59 -0000 -@@ -101,6 +101,8 @@ OBJFILES= $(OBJ)$/wldcrd.obj \ +@@ -101,3 +101,6 @@ OBJFILES= $(OBJ)$/wldcrd.obj \ $(OBJ)$/tdir.obj \ $(OBJ)$/urlobj.obj -+CFLAGS+=`pkg-config --cflags gnome-vfs-2.0` ++.IF "$(USE_GNOMEVFS)" == "TRUE" ++CFLAGS+=`pkg-config --cflags gnome-vfs-2.0` -DUSE_GNOMEVFS ++.ENDIF + + # --- Targets ------------------------------------------------------ @@ -37,13 +42,15 @@ retrieving revision 1.11.12.1 diff -u -p -r1.11.12.1 makefile.mk --- tools/util/makefile.mk 15 Aug 2003 11:30:50 -0000 1.11.12.1 +++ tools/util/makefile.mk 26 Aug 2004 15:02:41 -0000 -@@ -213,6 +213,10 @@ SHL1STDLIBS+= shell32.lib \ +@@ -213,6 +213,12 @@ SHL1STDLIBS+= shell32.lib \ uuid.lib \ advapi32.lib .ENDIF +.IF "$(GUI)"=="UNX" ++.IF "$(USE_GNOMEVFS)" == "TRUE" +SHL1STDLIBS+=`pkg-config --libs gnome-vfs-2.0` +.ENDIF ++.ENDIF + DEF1NAME =$(SHL1TARGET) @@ -56,10 +63,11 @@ retrieving revision 1.40 diff -u -w -r1.40 urlobj.cxx --- tools/source/fsys/urlobj.cxx 22 May 2003 08:45:17 -0000 1.40 +++ tools/source/fsys/urlobj.cxx 27 Aug 2004 10:00:06 -0000 -@@ -107,6 +107,16 @@ +@@ -107,6 +107,17 @@ #define INCLUDED_LIMITS #endif ++#ifdef USE_GNOMEVFS +#ifndef _VOS_MUTEX_HXX +#include <vos/mutex.hxx> +#endif @@ -69,41 +77,47 @@ diff -u -w -r1.40 urlobj.cxx + +#include <libgnomevfs/gnome-vfs.h> + -+ ++#endif /* USE_GNOMEVFS */ namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj; // unnamed namespaces don't work well yet... -@@ -393,6 +403,8 @@ +@@ -393,6 +403,10 @@ }; //============================================================================ ++#ifdef USE_GNOMEVFS +static INetURLObject::SchemeInfo *vfs_schemeinfo_map = NULL; ++#endif /* USE_GNOMEVFS */ + static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END] = { { "", "", 0, false, false, false, false, false, false, false, false }, -@@ -459,6 +471,9 @@ +@@ -459,6 +471,11 @@ inline INetURLObject::SchemeInfo const & INetURLObject::getSchemeInfo(INetProtocol eTheScheme) { ++#ifdef USE_GNOMEVFS + if (eTheScheme >= INET_PROT_END) + return vfs_schemeinfo_map [eTheScheme - INET_PROT_END]; + else ++#endif /* USE_GNOMEVFS */ return aSchemeInfoMap[eTheScheme]; }; -@@ -720,6 +735,10 @@ +@@ -720,6 +735,12 @@ // Parse <scheme>: sal_Unicode const * p = pPos; PrefixInfo const * pPrefix = getPrefix(p, pEnd); ++#ifdef USE_GNOMEVFS + ::rtl::OString tmpStr (rTheAbsURIRef.GetBuffer (), + rTheAbsURIRef.Len (), + RTL_TEXTENCODING_UTF8); + ++#endif /* USE_GNOMEVFS */ if (pPrefix) { pPos = p; -@@ -1329,14 +1348,17 @@ +@@ -1329,14 +1348,21 @@ case INET_PROT_LDAP: if (pHostPortBegin == pPort && pPort != pHostPortEnd) { @@ -114,27 +128,23 @@ diff -u -w -r1.40 urlobj.cxx break; default: -- if (pHostPortBegin == pPort) ++#ifdef USE_GNOMEVFS + if (m_eScheme < INET_PROT_END && /* else might have a port */ + pHostPortBegin == pPort) ++#else + if (pHostPortBegin == pPort) ++#endif /* USE_GNOMEVFS */ { +// fprintf (stderr, "bogus port\n"); setInvalid(); return false; } -@@ -2082,13 +2104,92 @@ +@@ -2082,8 +2104,93 @@ { "vnd.sun.star.wfs:", 0, INET_PROT_VND_SUN_STAR_WFS, PrefixInfo::OFFICIAL }, { "wfs:", "vnd.sun.star.wfs:", INET_PROT_VND_SUN_STAR_WFS, -- PrefixInfo::ALIAS } }; -- PrefixInfo const * pFirst = aMap + 1; -- PrefixInfo const * pLast = aMap + sizeof aMap / sizeof (PrefixInfo) - 1; -- PrefixInfo const * pMatch = 0; -- sal_Unicode const * pMatched = rBegin; -- sal_Unicode const * p = rBegin; -- xub_StrLen i = 0; -+ PrefixInfo::ALIAS } -+ }; + PrefixInfo::ALIAS } }; ++#ifdef USE_GNOMEVFS + +static GHashTable *fast_lookup = NULL; + int i; @@ -218,44 +228,53 @@ diff -u -w -r1.40 urlobj.cxx + return pi; + + -+#ifdef OVER_COMPLICATED_CODE - for (; pFirst < pLast; ++i) - { - if (pFirst->m_pPrefix[i] == '\0') ++#else /* USE_GNOMEVFS */ + PrefixInfo const * pFirst = aMap + 1; + PrefixInfo const * pLast = aMap + sizeof aMap / sizeof (PrefixInfo) - 1; + PrefixInfo const * pMatch = 0; + sal_Unicode const * pMatched = rBegin; @@ -2120,7 +2220,9 @@ } } rBegin = pMatched; + return pMatch; -+#endif ++#endif /* USE_GNOMEVFS */ } //============================================================================ -@@ -2359,7 +2461,7 @@ +@@ -2359,7 +2461,11 @@ break; default: -- if (aSynHost.Len() == 0) ++#ifdef USE_GNOMEVFS + if (aSynHost.Len() == 0 && m_eScheme < INET_PROT_END) ++#else + if (aSynHost.Len() == 0) ++#endif /* USE_GNOMEVFS */ return false; break; } -@@ -2436,6 +2538,7 @@ +@@ -2436,6 +2538,9 @@ aTheSynPath = '/'; break; ++#ifdef USE_GNOMEVFS + default: /* All INET_PROT_END+ drop through here */ ++#endif /* USE_GNOMEVFS */ case INET_PROT_FILE: case INET_PROT_VND_SUN_STAR_WFS: { -@@ -3618,7 +3721,8 @@ +@@ -3618,7 +3721,12 @@ break; default: -- if (aSynHost.Len() == 0) ++#ifdef USE_GNOMEVFS + if (aSynHost.Len() == 0 && + m_eScheme < INET_PROT_END) /* valid perhaps */ ++#else + if (aSynHost.Len() == 0) ++#endif /* USE_GNOMEVFS */ { setInvalid(); return false; diff --git a/patches/OOO_1_1/vfs-uri-filter.diff b/patches/OOO_1_1/vfs-uri-filter.diff new file mode 100644 index 000000000..131aa94e8 --- /dev/null +++ b/patches/OOO_1_1/vfs-uri-filter.diff @@ -0,0 +1,66 @@ +Index: ucb/source/regexp/regexp.cxx +=================================================================== +RCS file: /cvs/ucb/ucb/source/regexp/regexp.cxx,v +retrieving revision 1.3 +diff -u -p -u -r1.3 regexp.cxx +--- ucb/source/regexp/regexp.cxx 7 Nov 2001 08:15:54 -0000 1.3 ++++ ucb/source/regexp/regexp.cxx 30 Mar 2005 15:22:46 -0000 +@@ -77,6 +77,7 @@ + #ifndef _VOS_DIAGNOSE_H_ + #include <vos/diagnose.hxx> + #endif ++#include <tools/urlobj.hxx> + + namespace unnamed_ucb_regexp {} using namespace unnamed_ucb_regexp; + // unnamed namespaces don't work well yet... +@@ -196,6 +197,13 @@ bool Regexp::matches(rtl::OUString const + break; + } + ++ if (bMatches && isDefault()) ++ { // Gnome VFS matching eg. slot:.* in error ++ INetURLObject aURL( rString ); ++ if( aURL.GetProtocol() < INET_PROT_END ) ++ bMatches = false; ++ } ++ + if (bMatches) + if (m_bTranslation) + { + +Index: ucb/source/core/makefile.mk +=================================================================== +RCS file: /cvs/ucb/ucb/source/core/makefile.mk,v +retrieving revision 1.14.82.1 +diff -u -p -u -r1.14.82.1 makefile.mk +--- ucb/source/core/makefile.mk 28 Jan 2004 10:13:13 -0000 1.14.82.1 ++++ ucb/source/core/makefile.mk 30 Mar 2005 15:22:46 -0000 +@@ -92,7 +92,8 @@ SHL1STDLIBS=\ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ +- $(UCBHELPERLIB) ++ $(UCBHELPERLIB) \ ++ $(TOOLSLIB) + SHL1LIBS=\ + $(LIB1TARGET) \ + $(SLB)$/regexp.lib + + +Index: ucb/source/ucp/remote/makefile.mk +=================================================================== +RCS file: /cvs/ucb/ucb/source/ucp/remote/Attic/makefile.mk,v +retrieving revision 1.10.30.1 +diff -u -p -u -r1.10.30.1 makefile.mk +--- ucb/source/ucp/remote/makefile.mk 28 Jan 2004 10:15:11 -0000 1.10.30.1 ++++ ucb/source/ucp/remote/makefile.mk 30 Mar 2005 15:22:46 -0000 +@@ -101,7 +101,8 @@ SHL1STDLIBS = \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALHELPERLIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(TOOLSLIB) + SHL1DEPN = \ + $(L)$/iucbhelper.lib \ + $(L)$/icppuhelper.lib \ diff --git a/patches/OOO_1_1/zoom-combobox.diff b/patches/OOO_1_1/zoom-combobox.diff index 3c07fe8b3..ba5561851 100755 --- a/patches/OOO_1_1/zoom-combobox.diff +++ b/patches/OOO_1_1/zoom-combobox.diff @@ -206,9 +206,170 @@ diff -u -r1.35 tbcontrl.src + +#endif // _SVX_ZOOMTBXCTRL_HXX ---- /dev/null 2003-02-11 15:36:20.000000000 +0100 -+++ svx/source/tbxctrls/zoomtbxctrl.cxx 2003-08-17 18:27:29.000000000 +0200 -@@ -0,0 +1,236 @@ +--- sw/source/ui/app/swmodule.cxx 2003-07-07 18:10:23.000000000 +0200 ++++ sw/source/ui/app/swmodule.cxx 2003-08-13 22:52:29.000000000 +0200 +@@ -121,6 +121,9 @@ + #ifndef _SVX_VERT_TEXT_TBXCTRL_HXX + #include <svx/verttexttbxctrl.hxx> + #endif ++#ifndef _SVX_ZOOMTBXCTRL_HXX ++#include <svx/zoomtbxctrl.hxx> ++#endif + #ifndef _CONTDLG_HXX_ //autogen + #include <svx/contdlg.hxx> + #endif +@@ -573,6 +576,7 @@ + SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod ); + + SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod ); ++ SvxZoomToolBoxControl::RegisterControl(SID_ATTR_ZOOM, pMod); + SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod); + SwHyperlinkControl::RegisterControl(FN_STAT_HYPERLINKS, pMod ); + SvxPosSizeStatusBarControl::RegisterControl(0, pMod ); + +Index: sw/source/ui/uiview/pview.src +=================================================================== +RCS file: /cvs/sw/sw/source/ui/uiview/pview.src,v +retrieving revision 1.28 +diff -u -r1.28 pview.src +--- sw/source/ui/uiview/pview.src 17 Jul 2003 12:04:56 -0000 1.28 ++++ sw/source/ui/uiview/pview.src 20 Aug 2003 21:47:00 -0000 +@@ -1043,11 +1043,6 @@ + Identifier = SID_ZOOM_IN; + HelpID = SID_ZOOM_IN ; + }; +- ToolBoxItem +- { +- Identifier = FN_PREVIEW_ZOOM; +- HelpID = HID_PREVIEW_ZOOM ; +- }; + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; + ToolBoxItem + { +Index: sc/source/ui/app/scdll.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/ui/app/scdll.cxx,v +retrieving revision 1.14 +diff -u -r1.14 scdll.cxx +--- sc/source/ui/app/scdll.cxx 26 Mar 2003 18:05:47 -0000 1.14 ++++ sc/source/ui/app/scdll.cxx 18 Aug 2003 19:08:47 -0000 +@@ -105,6 +105,7 @@ + #include <svx/selctrl.hxx> + #include <svx/insctrl.hxx> + #include <svx/zoomctrl.hxx> ++#include <svx/zoomtbxctrl.hxx> + #include <svx/flditem.hxx> + #include <svx/modctrl.hxx> + #include <svx/pszctrl.hxx> +@@ -243,6 +244,7 @@ + SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); + SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); + SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod); ++ SvxZoomToolBoxControl ::RegisterControl(SID_ATTR_ZOOM, pMod); + SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod); + SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod); + +Index: sd/source/ui/app/sddll2.cxx +=================================================================== +RCS file: /cvs/graphics/sd/source/ui/app/sddll2.cxx,v +retrieving revision 1.10 +diff -u -r1.10 sddll2.cxx +--- sd/source/ui/app/sddll2.cxx 13 Sep 2002 13:42:54 -0000 1.10 ++++ sd/source/ui/app/sddll2.cxx 18 Aug 2003 19:03:03 -0000 +@@ -114,6 +114,9 @@ + #ifndef _SVX_ZOOMCTRL_HXX //autogen + #include <svx/zoomctrl.hxx> + #endif ++#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen ++#include <svx/zoomtbxctrl.hxx> ++#endif + #ifndef _SVX_PSZCTRL_HXX //autogen + #include <svx/pszctrl.hxx> + #endif +@@ -242,6 +245,7 @@ + + // StatusBarControls registrieren + SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod ); ++ SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pMod ); + SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod ); + SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod ); + //SvxInsertStatusBarControl::RegisterControl(0, pModd); +Index: starmath/source/smdll.cxx +=================================================================== +RCS file: /cvs/sw/starmath/source/smdll.cxx,v +retrieving revision 1.5 +diff -u -r1.5 smdll.cxx +--- starmath/source/smdll.cxx 12 Oct 2001 15:54:37 -0000 1.5 ++++ starmath/source/smdll.cxx 18 Aug 2003 19:10:56 -0000 +@@ -73,6 +73,9 @@ + #ifndef _SVX_ZOOMCTRL_HXX //autogen + #include <svx/zoomctrl.hxx> + #endif ++#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen ++#include <svx/zoomtbxctrl.hxx> ++#endif + #ifndef _SFX_OBJFAC_HXX + #include <sfx2/docfac.hxx> + #endif +@@ -147,6 +150,7 @@ + SmViewShell::RegisterInterface(pp); + + SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pp ); ++ SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pp ); + SvxModifyControl::RegisterControl( SID_TEXTSTATUS, pp ); + SvxUndoRedoControl::RegisterControl( SID_UNDO, pp ); + SvxUndoRedoControl::RegisterControl( SID_REDO, pp ); +cvs server: Diffing starmath/util +cvs server: Diffing starmath/xml +Index: svx/prj/d.lst +=================================================================== +RCS file: /cvs/graphics/svx/prj/d.lst,v +retrieving revision 1.74 +diff -u -3 -p -r1.74 d.lst +--- svx/prj/d.lst 29 Apr 2003 16:30:00 -0000 1.74 ++++ svx/prj/d.lst 19 Aug 2003 15:25:12 -0000 +@@ -487,6 +487,7 @@ hedabu: ..\inc\xexch.hxx %_DEST%\inc%_EX + hedabu: ..\inc\zoom.hxx %_DEST%\inc%_EXT%\svx\zoom.hxx + hedabu: ..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx + hedabu: ..\inc\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx ++hedabu: ..\inc\zoomtbxctrl.hxx %_DEST%\inc%_EXT%\svx\zoomtbxctrl.hxx + hedabu: ..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx + hedabu: ..\inc\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx + hedabu: ..\inc\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx + +--- svx/inc/dialogs.hrc 2005-03-30 20:37:11.671575983 +0530 ++++ svx/inc/dialogs.hrc 2005-03-23 16:57:35.000000000 +0530 +@@ -1116,6 +1116,12 @@ + #define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) + #define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) + ++// Zoom ComboBox Strings ++#define RID_SVX_ZOOM_PAGEWIDTH (RID_SVX_START + 856) ++#define RID_SVX_ZOOM_WHOLEPAGE (RID_SVX_START + 857) ++#define RID_SVX_ZOOM_OPTIMAL (RID_SVX_START + 858) ++ ++ + // Accessibility strings. The actual string ids are defined in + // svx/inc/accessibility.hrc, the strings are defined in + // svx/source/accessibility/accessibility.src + +--- svx/source/dialog/zoom.cxx 2005-04-01 15:45:11.468692425 +0530 ++++ svx/source/dialog/zoom.cxx 2005-04-01 15:46:19.036270372 +0530 +@@ -284,6 +284,10 @@ + aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) ); + aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) ); + ++ aOptimalBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_OPTIMAL ) ) ); ++ aPageWidthBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_PAGEWIDTH ) ) ); ++ aWholePageBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_WHOLEPAGE ) ) ); ++ + // Default-Werte + USHORT nValue = 100; + USHORT nMin = 10; + +--- /dev/null 2004-08-25 23:04:59.000000000 +0530 ++++ svx/source/tbxctrls/zoomtbxctrl.cxx 2005-04-01 15:23:21.000000000 +0530 +@@ -0,0 +1,276 @@ +/************************************************************************* + * + * $RCSfile$ @@ -287,7 +448,9 @@ diff -u -r1.35 tbcontrl.src +#ifndef _SV_COMBOBOX_HXX +#include <vcl/combobox.hxx> +#endif -+ ++//#ifndef _RTL_USTRING_HXX_ ++#include <rtl/ustring.hxx> ++//#endif +#include "dialogs.hrc" + +#include "zoomtbxctrl.hxx" @@ -296,14 +459,20 @@ diff -u -r1.35 tbcontrl.src + +#define MINZOOM 20 +#define MAXZOOM 600 ++#define DEFAULT_ZOOM 100 ++ + +SFX_IMPL_TOOLBOX_CONTROL( SvxZoomToolBoxControl, SvxZoomItem); + +class SvxZoomBox_Impl : public ComboBox +{ -+ USHORT nSlotId; -+ SfxBindings& rBindings; -+ BOOL bRelease; ++ USHORT nSlotId; ++ SfxBindings& rBindings; ++ BOOL bRelease; ++ String maWholePage; ++ String maOptimal; ++ String maPageWidth; ++ +public: + SvxZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBind ); + ~SvxZoomBox_Impl(); @@ -316,11 +485,19 @@ diff -u -r1.35 tbcontrl.src + +}; + ++static String RemoveTilda( USHORT nId ) ++{ ++ return String( SVX_RESSTR ( nId ) ).EraseAllChars('~'); ++} ++ +SvxZoomBox_Impl::SvxZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBind ): + ComboBox(pParent, SVX_RES(RID_SVXTBX_ZOOM)), + nSlotId(nSlot), + rBindings(rBind), -+ bRelease(TRUE) ++ bRelease(TRUE), ++ maPageWidth( RemoveTilda ( RID_SVX_ZOOM_PAGEWIDTH ) ), ++ maOptimal( RemoveTilda ( RID_SVX_ZOOM_OPTIMAL ) ), ++ maWholePage( RemoveTilda ( RID_SVX_ZOOM_WHOLEPAGE ) ) +{ + EnableAutocomplete( FALSE ); + USHORT aZoomValues[] = @@ -331,6 +508,10 @@ diff -u -r1.35 tbcontrl.src + sEntry += '%'; + InsertEntry(sEntry); + } ++ InsertEntry( maPageWidth ); ++ InsertEntry( maOptimal ); ++ InsertEntry( maWholePage ); ++ +} + +SvxZoomBox_Impl::~SvxZoomBox_Impl() @@ -340,21 +521,41 @@ diff -u -r1.35 tbcontrl.src +{ + if ( !IsTravelSelect() ) + { -+ String sEntry( GetText() ); -+ sEntry.EraseAllChars( '%' ); -+ USHORT nZoom = (USHORT)sEntry.ToInt32(); + -+ if( nZoom < MINZOOM ) ++ String sEntry( GetText( ) ); ++ if( sEntry == maWholePage ) ++ { ++ SvxZoomItem aItem( SVX_ZOOM_WHOLEPAGE, DEFAULT_ZOOM, nSlotId ); ++ rBindings.GetDispatcher()->Execute( ++ nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); ++ } ++ else if( sEntry == maPageWidth ) ++ { ++ SvxZoomItem aItem( SVX_ZOOM_PAGEWIDTH, DEFAULT_ZOOM, nSlotId ); ++ rBindings.GetDispatcher()->Execute( ++ nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); ++ } ++ else if( sEntry == maOptimal ) ++ { ++ SvxZoomItem aItem( SVX_ZOOM_OPTIMAL, DEFAULT_ZOOM, nSlotId ); ++ rBindings.GetDispatcher()->Execute( ++ nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); ++ } ++ else ++ { ++ sEntry.EraseAllChars( '%' ); ++ USHORT nZoom = (USHORT)sEntry.ToInt32(); ++ ++ if( nZoom < MINZOOM ) + nZoom = MINZOOM; -+ if( nZoom > MAXZOOM ) ++ if( nZoom > MAXZOOM ) + nZoom = MAXZOOM; -+ -+ SvxZoomItem aItem( SVX_ZOOM_PERCENT, nZoom, nSlotId ); -+ rBindings.GetDispatcher()->Execute( -+ nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); -+ ++ SvxZoomItem aItem( SVX_ZOOM_PERCENT, nZoom, nSlotId ); ++ rBindings.GetDispatcher()->Execute( ++ nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); ++ } ++ } + ReleaseFocus(); -+ } +} + +long SvxZoomBox_Impl::Notify( NotifyEvent& rNEvt ) @@ -445,134 +646,301 @@ diff -u -r1.35 tbcontrl.src + SvxZoomBox_Impl* pRet = new SvxZoomBox_Impl( pParent, GetId(), GetBindings() ); + return pRet; +} -diff -Nur -x CVS -x unxlngi4.pro -x '*.bmp' -x ooo-convert-stamp sw/source/ui/app/swmodule.cxx sw/source/ui/app/swmodule.cxx ---- sw/source/ui/app/swmodule.cxx 2003-07-07 18:10:23.000000000 +0200 -+++ sw/source/ui/app/swmodule.cxx 2003-08-13 22:52:29.000000000 +0200 -@@ -121,6 +121,9 @@ - #ifndef _SVX_VERT_TEXT_TBXCTRL_HXX - #include <svx/verttexttbxctrl.hxx> - #endif -+#ifndef _SVX_ZOOMTBXCTRL_HXX -+#include <svx/zoomtbxctrl.hxx> -+#endif - #ifndef _CONTDLG_HXX_ //autogen - #include <svx/contdlg.hxx> - #endif -@@ -573,6 +576,7 @@ - SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod ); - - SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod ); -+ SvxZoomToolBoxControl::RegisterControl(SID_ATTR_ZOOM, pMod); - SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod); - SwHyperlinkControl::RegisterControl(FN_STAT_HYPERLINKS, pMod ); - SvxPosSizeStatusBarControl::RegisterControl(0, pMod ); -Index: sw/source/ui/uiview/pview.src -=================================================================== -RCS file: /cvs/sw/sw/source/ui/uiview/pview.src,v -retrieving revision 1.28 -diff -u -r1.28 pview.src ---- sw/source/ui/uiview/pview.src 17 Jul 2003 12:04:56 -0000 1.28 -+++ sw/source/ui/uiview/pview.src 20 Aug 2003 21:47:00 -0000 -@@ -1043,11 +1043,6 @@ - Identifier = SID_ZOOM_IN; - HelpID = SID_ZOOM_IN ; - }; -- ToolBoxItem -- { -- Identifier = FN_PREVIEW_ZOOM; -- HelpID = HID_PREVIEW_ZOOM ; -- }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { -Index: sc/source/ui/app/scdll.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/ui/app/scdll.cxx,v -retrieving revision 1.14 -diff -u -r1.14 scdll.cxx ---- sc/source/ui/app/scdll.cxx 26 Mar 2003 18:05:47 -0000 1.14 -+++ sc/source/ui/app/scdll.cxx 18 Aug 2003 19:08:47 -0000 -@@ -105,6 +105,7 @@ - #include <svx/selctrl.hxx> - #include <svx/insctrl.hxx> - #include <svx/zoomctrl.hxx> -+#include <svx/zoomtbxctrl.hxx> - #include <svx/flditem.hxx> - #include <svx/modctrl.hxx> - #include <svx/pszctrl.hxx> -@@ -243,6 +244,7 @@ - SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod); - SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod); - SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod); -+ SvxZoomToolBoxControl ::RegisterControl(SID_ATTR_ZOOM, pMod); - SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod); - SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod); +--- svx/source/tbxctrls/tbcontrl.src 2005-03-30 21:53:57.000000000 +0530 ++++ svx/source/tbxctrls/tbcontrl.src 2005-03-23 18:10:06.000000000 +0530 +@@ -517,6 +517,141 @@ + Text[ kannada ] = "ಪುಟಗಳು"; + Text[ galician ] = "Pages"; + }; ++String RID_SVX_ZOOM_WHOLEPAGE ++{ ++ Text = "Ganze Seite" ; ++ Text [ ENGLISH ] = "Whole page" ; ++ Text [ norwegian ] = "Hele siden" ; ++ Text [ italian ] = "Pagina intera" ; ++ Text [ portuguese_brazilian ] = "Pgina Int~eira" ; ++ Text [ portuguese ] = "Pgina inteira" ; ++ Text [ finnish ] = "Koko sivu" ; ++ Text [ danish ] = "Hele siden" ; ++ Text [ french ] = "Page entire" ; ++ Text [ swedish ] = "Hela sidan" ; ++ Text [ dutch ] = "Hele pagina" ; ++ Text [ spanish ] = "Toda la pgina" ; ++ Text [ english_us ] = "Entire Page" ; ++ Text[ chinese_simplified ] = "整页(E)"; ++ Text[ russian ] = " "; ++ Text[ polish ] = "~Caa strona"; ++ Text[ japanese ] = "ページ全体(E)"; ++ Text[ chinese_traditional ] = "整頁(E)"; ++ Text[ arabic ] = " "; ++ Text[ greek ] = " "; ++ Text[ korean ] = "전체 페이지(E)"; ++ Text[ turkish ] = "Tam sayfa"; ++ Text[ language_user1 ] = "Cela stran"; ++ Text[ catalan ] = "~Tota la pgina"; ++ Text[ thai ] = "~ทั้งหน้า"; ++ Text[ czech ] = "Celá stránka"; ++ Text[ hebrew ] = "עמוד שלם"; ++ Text[ hindi ] = "~सम्पूर्ण पृष्ठ"; ++ Text[ slovak ] = "Celá stránka"; ++ Text[ hungarian ] = "Teljes oldal"; ++ Text[ slovenian ] = "Cela stran"; ++ Text[ estonian ] = "Terve lehekülg"; ++ Text[ welsh ] = "Tudalen Gyfan"; ++ Text[ northernsotho ] = "Letlakala Ka moka"; ++ Text[ afrikaans ] = "Hele bladsy"; ++ Text[ zulu ] = "Ikhasi lonke"; ++ Text[ norwegian_nynorsk ] = "Heile sida"; ++ Text[ tswana ] = "Yotlhe Tsebe"; ++ Text[ basque ] = "Orrialde osoa"; ++ Text[ lithuanian ] = "Visas puslapis"; ++ Text[ kannada ] = "ಸಂಪೂರ್ಣ ಪುಟ"; ++ Text[ galician ] = "Toda a pxina"; ++ }; ++String RID_SVX_ZOOM_PAGEWIDTH ++{ ++ Text = "Seitenbreite" ; ++ Text [ ENGLISH ] = "Page width" ; ++ Text [ norwegian ] = "Sidebredde" ; ++ Text [ italian ] = "Largh. pagina" ; ++ Text [ portuguese_brazilian ] = "Largura da Pgina" ; ++ Text [ portuguese ] = "Larg. de pgina" ; ++ Text [ finnish ] = "Sivun leveys" ; ++ Text [ danish ] = "Sidebredde" ; ++ Text [ french ] = "Largeur de page" ; ++ Text [ swedish ] = "Sidbredd" ; ++ Text [ dutch ] = "Paginabreedte" ; ++ Text [ spanish ] = "Ancho de pgina" ; ++ Text [ english_us ] = "Page Width" ; ++ Text[ chinese_simplified ] = "页面宽度(P)"; ++ Text[ russian ] = " "; ++ Text[ polish ] = "Szeroko strony"; ++ Text[ japanese ] = "ページ幅(~P)"; ++ Text[ chinese_traditional ] = "頁面寬度(~P)"; ++ Text[ arabic ] = " "; ++ Text[ greek ] = " "; ++ Text[ korean ] = "페이지 너비(~P)"; ++ Text[ turkish ] = "Sayfa genilii"; ++ Text[ language_user1 ] = "Širina strani"; ++ Text[ catalan ] = "Ample de pgina"; ++ Text[ thai ] = "ความกว้างของ~หน้า"; ++ Text[ czech ] = "Šířka stránky"; ++ Text[ hebrew ] = "רוחב עמוד"; ++ Text[ hindi ] = "~पृष्ठ चौड़ाई"; ++ Text[ slovak ] = "Šírka stránky"; ++ Text[ hungarian ] = "~Oldalszélesség"; ++ Text[ slovenian ] = "Širina strani"; ++ Text[ estonian ] = "Lehekülje laius"; ++ Text[ welsh ] = "Lled tudalen"; ++ Text[ northernsotho ] = "Bophara bja Letlakala"; ++ Text[ afrikaans ] = "Bladsybreedte"; ++ Text[ zulu ] = "Ububanzi bekhasi"; ++ Text[ norwegian_nynorsk ] = "Sidebreidd"; ++ Text[ tswana ] = "Tsebe Bophara"; ++ Text[ basque ] = "Orrialde-zabalera"; ++ Text[ lithuanian ] = "Puslapio plotis"; ++ Text[ kannada ] = "ಪುಟದ ಅಗಲ"; ++ Text[ galician ] = "Ancho de pxina"; ++ }; ++String RID_SVX_ZOOM_OPTIMAL ++{ ++ Text = "Optimal" ; ++ Text [ English ] = "Optimal" ; ++ Text [ norwegian ] = "Best mulig" ; ++ Text [ italian ] = "Ottimale" ; ++ Text [ portuguese_brazilian ] = "Ideal" ; ++ Text [ portuguese ] = "Optimizar" ; ++ Text [ finnish ] = "Optimaalinen" ; ++ Text [ danish ] = "Optimal" ; ++ Text [ french ] = "Optimal" ; ++ Text [ swedish ] = "Optimal" ; ++ Text [ dutch ] = "Optimaal" ; ++ Text [ spanish ] = "ptimo" ; ++ Text [ english_us ] = "Optimal" ; ++ Text[ chinese_simplified ] = "最佳(O)"; ++ Text[ russian ] = ""; ++ Text[ polish ] = "Optymalnie"; ++ Text[ japanese ] = "最適(O)"; ++ Text[ chinese_traditional ] = "最合適(O)"; ++ Text[ arabic ] = ""; ++ Text[ greek ] = ""; ++ Text[ korean ] = "최적으로(O)"; ++ Text[ turkish ] = "En Uygun"; ++ Text[ language_user1 ] = "Optimalno"; ++ Text[ catalan ] = "ptim"; ++ Text[ thai ] = "เห~มาะที่สุด"; ++ Text[ czech ] = "Optimální"; ++ Text[ hebrew ] = "מיטבי"; ++ Text[ hindi ] = "~योग्य"; ++ Text[ slovak ] = "~Optimálny"; ++ Text[ hungarian ] = "Szöveghatár"; ++ Text[ slovenian ] = "Optimalno"; ++ Text[ estonian ] = "Optimaalne"; ++ Text[ welsh ] = "Gorau"; ++ Text[ northernsotho ] = "Kgolo"; ++ Text[ afrikaans ] = "Optimale"; ++ Text[ zulu ] = "Okuthandwayo"; ++ Text[ norwegian_nynorsk ] = "Best mogleg"; ++ Text[ tswana ] = "Kgethegile"; ++ Text[ basque ] = "Onena"; ++ Text[ lithuanian ] = "Optimalus"; ++ Text[ kannada ] = "ಅತ್ಯಂತ ಅನುಕೂಲಕರ"; ++ Text[ galician ] = "ptimo"; ++ }; + Image RID_SVXIMG_GRAF_RED + { + ImageBitmap = Bitmap { File = "sc10865.bmp" ; }; +@@ -588,6 +723,7 @@ + MASKCOLOR + }; -Index: sd/source/ui/app/sddll2.cxx -=================================================================== -RCS file: /cvs/graphics/sd/source/ui/app/sddll2.cxx,v -retrieving revision 1.10 -diff -u -r1.10 sddll2.cxx ---- sd/source/ui/app/sddll2.cxx 13 Sep 2002 13:42:54 -0000 1.10 -+++ sd/source/ui/app/sddll2.cxx 18 Aug 2003 19:03:03 -0000 -@@ -114,6 +114,9 @@ - #ifndef _SVX_ZOOMCTRL_HXX //autogen - #include <svx/zoomctrl.hxx> - #endif -+#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen -+#include <svx/zoomtbxctrl.hxx> -+#endif - #ifndef _SVX_PSZCTRL_HXX //autogen - #include <svx/pszctrl.hxx> - #endif -@@ -242,6 +245,7 @@ ++ + // ********************************************************************** EOF - // StatusBarControls registrieren - SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod ); -+ SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pMod ); - SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod ); - SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod ); - //SvxInsertStatusBarControl::RegisterControl(0, pModd); -Index: starmath/source/smdll.cxx -=================================================================== -RCS file: /cvs/sw/starmath/source/smdll.cxx,v -retrieving revision 1.5 -diff -u -r1.5 smdll.cxx ---- starmath/source/smdll.cxx 12 Oct 2001 15:54:37 -0000 1.5 -+++ starmath/source/smdll.cxx 18 Aug 2003 19:10:56 -0000 -@@ -73,6 +73,9 @@ - #ifndef _SVX_ZOOMCTRL_HXX //autogen - #include <svx/zoomctrl.hxx> - #endif -+#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen -+#include <svx/zoomtbxctrl.hxx> -+#endif - #ifndef _SFX_OBJFAC_HXX - #include <sfx2/docfac.hxx> - #endif -@@ -147,6 +150,7 @@ - SmViewShell::RegisterInterface(pp); - SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pp ); -+ SvxZoomToolBoxControl::RegisterControl( SID_ATTR_ZOOM, pp ); - SvxModifyControl::RegisterControl( SID_TEXTSTATUS, pp ); - SvxUndoRedoControl::RegisterControl( SID_UNDO, pp ); - SvxUndoRedoControl::RegisterControl( SID_REDO, pp ); -cvs server: Diffing starmath/util -cvs server: Diffing starmath/xml -Index: svx/prj/d.lst -=================================================================== -RCS file: /cvs/graphics/svx/prj/d.lst,v -retrieving revision 1.74 -diff -u -3 -p -r1.74 d.lst ---- svx/prj/d.lst 29 Apr 2003 16:30:00 -0000 1.74 -+++ svx/prj/d.lst 19 Aug 2003 15:25:12 -0000 -@@ -487,6 +487,7 @@ hedabu: ..\inc\xexch.hxx %_DEST%\inc%_EX - hedabu: ..\inc\zoom.hxx %_DEST%\inc%_EXT%\svx\zoom.hxx - hedabu: ..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx - hedabu: ..\inc\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx -+hedabu: ..\inc\zoomtbxctrl.hxx %_DEST%\inc%_EXT%\svx\zoomtbxctrl.hxx - hedabu: ..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx - hedabu: ..\inc\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx - hedabu: ..\inc\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx +--- svx/source/dialog/zoom.src 2004-09-09 21:41:33.000000000 +0530 ++++ svx/source/dialog/zoom.src.bak 2005-04-07 11:27:12.168372800 +0530 +@@ -76,142 +76,16 @@ + { + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 80 , 10 ) ; +- Text = "~Ganze Seite" ; +- Text [ ENGLISH ] = "~Whole page" ; +- Text [ norwegian ] = "~Hele siden" ; +- Text [ italian ] = "~Pagina intera" ; +- Text [ portuguese_brazilian ] = "Pgina Int~eira" ; +- Text [ portuguese ] = "~Pgina inteira" ; +- Text [ finnish ] = "~Koko sivu" ; +- Text [ danish ] = "H~ele siden" ; +- Text [ french ] = "Page entire" ; +- Text [ swedish ] = "Hela sidan" ; +- Text [ dutch ] = "H~ele pagina" ; +- Text [ spanish ] = "~Toda la pgina" ; +- Text [ english_us ] = "~Entire Page" ; +- Text[ chinese_simplified ] = "整页(~E)"; +- Text[ russian ] = " "; +- Text[ polish ] = "~Caa strona"; +- Text[ japanese ] = "ページ全体(~E)"; +- Text[ chinese_traditional ] = "整頁(~E)"; +- Text[ arabic ] = " "; +- Text[ greek ] = " "; +- Text[ korean ] = "전체 페이지(~E)"; +- Text[ turkish ] = "Tam sayfa"; +- Text[ language_user1 ] = "~Cela stran"; +- Text[ catalan ] = "~Tota la pgina"; +- Text[ thai ] = "~ทั้งหน้า"; +- Text[ czech ] = "Celá stránka"; +- Text[ hebrew ] = "עמוד שלם"; +- Text[ hindi ] = "~सम्पूर्ण पृष्ठ"; +- Text[ slovak ] = "~Celá stránka"; +- Text[ hungarian ] = "~Teljes oldal"; +- Text[ slovenian ] = "~Cela stran"; +- Text[ estonian ] = "T~erve lehekülg"; +- Text[ welsh ] = "~Tudalen Gyfan"; +- Text[ northernsotho ] = "~Letlakala Ka moka"; +- Text[ afrikaans ] = "~Hele bladsy"; +- Text[ zulu ] = "Ikhasi ~lonke"; +- Text[ norwegian_nynorsk ] = "~Heile sida"; +- Text[ tswana ] = "~Yotlhe Tsebe"; +- Text[ basque ] = "~Orrialde osoa"; +- Text[ lithuanian ] = "~Visas puslapis"; +- Text[ kannada ] = "ಸಂಪೂರ್ಣ ಪುಟ"; +- Text[ galician ] = "~Toda a pxina"; + }; + RadioButton BTN_PAGE_WIDTH + { + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 80 , 10 ) ; +- Text = "Seiten~breite" ; +- Text [ ENGLISH ] = "~Page width" ; +- Text [ norwegian ] = "~Sidebredde" ; +- Text [ italian ] = "Larg~h. pagina" ; +- Text [ portuguese_brazilian ] = "Largura da ~Pgina" ; +- Text [ portuguese ] = "~Larg. de pgina" ; +- Text [ finnish ] = "~Sivun leveys" ; +- Text [ danish ] = "Side~bredde" ; +- Text [ french ] = "~Largeur de page" ; +- Text [ swedish ] = "Sidbredd" ; +- Text [ dutch ] = "~Paginabreedte" ; +- Text [ spanish ] = "~Ancho de pgina" ; +- Text [ english_us ] = "~Page Width" ; +- Text[ chinese_simplified ] = "页面宽度(~P)"; +- Text[ russian ] = " "; +- Text[ polish ] = "Szeroko ~strony"; +- Text[ japanese ] = "ページ幅(~P)"; +- Text[ chinese_traditional ] = "頁面寬度(~P)"; +- Text[ arabic ] = " "; +- Text[ greek ] = " "; +- Text[ korean ] = "페이지 너비(~P)"; +- Text[ turkish ] = "Sayfa genilii"; +- Text[ language_user1 ] = "Širina s~trani"; +- Text[ catalan ] = "~Ample de pgina"; +- Text[ thai ] = "ความกว้างของ~หน้า"; +- Text[ czech ] = "Šířka stránky"; +- Text[ hebrew ] = "רוחב עמוד"; +- Text[ hindi ] = "~पृष्ठ चौड़ाई"; +- Text[ slovak ] = "Šírka ~stránky"; +- Text[ hungarian ] = "~Oldalszélesség"; +- Text[ slovenian ] = "Širina s~trani"; +- Text[ estonian ] = "~Lehekülje laius"; +- Text[ welsh ] = "~Lled tudalen"; +- Text[ northernsotho ] = "~Bophara bja Letlakala"; +- Text[ afrikaans ] = "~Bladsybreedte"; +- Text[ zulu ] = "Ububanzi be~khasi"; +- Text[ norwegian_nynorsk ] = "~Sidebreidd"; +- Text[ tswana ] = "~Tsebe Bophara"; +- Text[ basque ] = "O~rrialde-zabalera"; +- Text[ lithuanian ] = "~Puslapio plotis"; +- Text[ kannada ] = "ಪುಟದ ಅಗಲ"; +- Text[ galician ] = "~Ancho de pxina"; + }; + RadioButton BTN_OPTIMAL + { + Pos = MAP_APPFONT ( 12 , 40 ) ; + Size = MAP_APPFONT ( 80 , 10 ) ; +- Text = "~Optimal" ; +- Text [ English ] = "~Optimal" ; +- Text [ norwegian ] = "~Best mulig" ; +- Text [ italian ] = "~Ottimale" ; +- Text [ portuguese_brazilian ] = "~Ideal" ; +- Text [ portuguese ] = "~Optimizar" ; +- Text [ finnish ] = "O~ptimaalinen" ; +- Text [ danish ] = "~Optimal" ; +- Text [ french ] = "~Optimal" ; +- Text [ swedish ] = "Optimal" ; +- Text [ dutch ] = "~Optimaal" ; +- Text [ spanish ] = "~ptimo" ; +- Text [ english_us ] = "~Optimal" ; +- Text[ chinese_simplified ] = "最佳(~O)"; +- Text[ russian ] = ""; +- Text[ polish ] = "~Optymalnie"; +- Text[ japanese ] = "最適(~O)"; +- Text[ chinese_traditional ] = "最合適(~O)"; +- Text[ arabic ] = ""; +- Text[ greek ] = ""; +- Text[ korean ] = "최적으로(~O)"; +- Text[ turkish ] = "~En Uygun"; +- Text[ language_user1 ] = "~Optimalno"; +- Text[ catalan ] = "~ptim"; +- Text[ thai ] = "เห~มาะที่สุด"; +- Text[ czech ] = "Optimální"; +- Text[ hebrew ] = "מיטבי"; +- Text[ hindi ] = "~योग्य"; +- Text[ slovak ] = "~Optimálny"; +- Text[ hungarian ] = "S~zöveghatár"; +- Text[ slovenian ] = "~Optimalno"; +- Text[ estonian ] = "~Optimaalne"; +- Text[ welsh ] = "~Gorau"; +- Text[ northernsotho ] = "~Kgolo"; +- Text[ afrikaans ] = "~Optimale"; +- Text[ zulu ] = "~Okuthandwayo"; +- Text[ norwegian_nynorsk ] = "~Best mogleg"; +- Text[ tswana ] = "~Kgethegile"; +- Text[ basque ] = "O~nena"; +- Text[ lithuanian ] = "~Optimalus"; +- Text[ kannada ] = "ಅತ್ಯಂತ ಅನುಕೂಲಕರ"; +- Text[ galician ] = "~ptimo"; + }; + RadioButton BTN_200 + { diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff new file mode 100644 index 000000000..2904ec4b0 --- /dev/null +++ b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-cxx.diff @@ -0,0 +1,167 @@ +--- /dev/null 2004-08-25 23:04:59.000000000 +0530 ++++ connectivity/source/drivers/evoab1.5/EApi.cxx 2005-02-22 17:41:54.999516706 +0530 +@@ -0,0 +1,164 @@ ++ /************************************************************************* ++ * ++ * $RCSfile$ ++ * ++ * $Revision$ ++ * ++ * last change: $Author$ $Date$ ++ * ++ * The Contents of this file are made available subject to the terms of ++ * either of the following licenses ++ * ++ * - GNU Lesser General Public License Version 2.1 ++ * - Sun Industry Standards Source License Version 1.1 ++ * ++ * Sun Microsystems Inc., October, 2000 ++ * ++ * GNU Lesser General Public License Version 2.1 ++ * ============================================= ++ * Copyright 2000 by Sun Microsystems, Inc. ++ * 901 San Antonio Road, Palo Alto, CA 94303, USA ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License version 2.1, as published by the Free Software Foundation. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ * ++ * ++ * Sun Industry Standards Source License Version 1.1 ++ * ================================================= ++ * The contents of this file are subject to the Sun Industry Standards ++ * Source License Version 1.1 (the License); You may not use this file ++ * except in compliance with the License. You may obtain a copy of the ++ * License at http://www.openoffice.org/license.html. ++ * ++ * Software provided under this License is provided on an AS IS basis, ++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, ++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, ++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. ++ * See the License for the specific provisions governing your rights and ++ * obligations concerning the Software. ++ * ++ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. ++ * ++ * Copyright: 2000 by Sun Microsystems, Inc. ++ * ++ * All Rights Reserved. ++ * ++ * Contributor(s): Michael Meeks, Jayant Madavi ++ * ++ * ++ ************************************************************************/ ++ ++#include <rtl/ustring.hxx> ++#include <osl/module.h> ++#include <stdio.h> ++#define _EVOLUTION_ALREADY_DEFINED_ 1 ++#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_ ++#include "EApi.h" ++#endif ++static char *eBookLibNames[] = { ++ "libebook.so.8", // evolution-2.0 ++ "libebook-1.2.so.3" // evolution-2.2 ++ // FIXME: ask JPR about ABI compatibility going forwards ++ // "libebook-1.3.so.0", ++ // "libebook-1.4.so.0", ++ // "libebook-1.5.so.0" ++}; ++ ++typedef void (*SymbolFunc) (void); ++ ++#define SYM_MAP(a) { #a, (SymbolFunc *)&a } ++ static struct { ++ const char *sym_name; ++ SymbolFunc *ref_value; ++ } aApiMap[] = { ++ SYM_MAP( e_contact_get_type ), ++ SYM_MAP( e_contact_field_id ), ++ SYM_MAP( e_source_peek_name ), ++ SYM_MAP( e_source_get_property ), ++ SYM_MAP( e_source_list_peek_groups ), ++ SYM_MAP( e_source_group_peek_sources ), ++ SYM_MAP( e_book_new ), ++ SYM_MAP( e_book_open ), ++ SYM_MAP( e_book_get_uri ), ++ SYM_MAP( e_book_get_source ), ++ SYM_MAP( e_book_get_addressbooks ), ++ SYM_MAP( e_book_get_contacts ), ++ SYM_MAP( e_book_authenticate_user ), ++ SYM_MAP( e_book_query_field_test ), ++ SYM_MAP( e_book_query_and ), ++ SYM_MAP( e_book_query_or ), ++ SYM_MAP( e_book_query_not ), ++ SYM_MAP( e_book_query_unref ), ++ SYM_MAP( e_book_query_to_string ), ++ SYM_MAP( e_book_query_field_exists ), ++ SYM_MAP( e_source_group_peek_base_uri) ++ }; ++#undef SYM_MAP ++ ++static bool ++tryLink( oslModule &aModule, const char *pName ) ++{ ++ for( guint i = 0; i < G_N_ELEMENTS( aApiMap ); i++ ) ++ { ++ SymbolFunc aMethod; ++ aMethod = (SymbolFunc) osl_getSymbol ++ ( aModule, rtl::OUString::createFromAscii ( aApiMap[ i ].sym_name ).pData ); ++ if( !aMethod ) ++ { ++ fprintf( stderr, "Warning: missing symbol '%s' in '%s'", ++ aApiMap[ i ].sym_name, pName ); ++ return false; ++ } ++ * aApiMap[ i ].ref_value = aMethod; ++ } ++ return true; ++} ++ ++bool EApiInit() ++{ ++ oslModule aModule; ++ ++ for( guint j = 0; j < G_N_ELEMENTS( eBookLibNames ); j++ ) ++ { ++ aModule = osl_loadModule( rtl::OUString::createFromAscii ++ ( eBookLibNames[ j ] ).pData, ++ SAL_LOADMODULE_DEFAULT ); ++ if( aModule) ++ { ++ if ( tryLink( aModule, eBookLibNames[ j ] ) ) ++ return true; ++ osl_unloadModule( aModule ); ++ } ++ } ++ fprintf( stderr, "Can find no compliant libebook client libraries\n" ); ++ return false; ++} ++ ++#if 0 ++ ++ Test code - enable & ++ * ++ * Compile with ( after source LinuxIntelEnv.Set.sh ) ++ gcc $SOLARDEF -I $SOLARSRC/sal/inc -I $SOLARSRC/sal/unxlngi4.pro/inc \ ++ -I. `pkg-config --cflags --libs gobject-2.0` \ ++ -L $SOLARSRC/sal/unxlngi4.pro/lib -luno_sal -lstdc++ EApi.cxx ++ ++ ++int main( int argc, char **argv) ++{ ++ return EApiInit(); ++} ++ ++#endif ++ diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-h.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-h.diff new file mode 100644 index 000000000..1dc2b2744 --- /dev/null +++ b/patches/evo2/connectivity-source-drivers-evoab1-5-EApi-h.diff @@ -0,0 +1,212 @@ +--- /dev/null 2004-08-25 23:04:59.000000000 +0530 ++++ connectivity/source/drivers/evoab1.5/EApi.h 2005-02-01 20:09:47.610558046 +0530 +@@ -0,0 +1,209 @@ ++ /************************************************************************* ++ * ++ * $RCSfile$ ++ * ++ * $Revision$ ++ * ++ * last change: $Author$ $Date$ ++ * ++ * The Contents of this file are made available subject to the terms of ++ * either of the following licenses ++ * ++ * - GNU Lesser General Public License Version 2.1 ++ * - Sun Industry Standards Source License Version 1.1 ++ * ++ * Sun Microsystems Inc., October, 2000 ++ * ++ * GNU Lesser General Public License Version 2.1 ++ * ============================================= ++ * Copyright 2000 by Sun Microsystems, Inc. ++ * 901 San Antonio Road, Palo Alto, CA 94303, USA ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License version 2.1, as published by the Free Software Foundation. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ * ++ * ++ * Sun Industry Standards Source License Version 1.1 ++ * ================================================= ++ * The contents of this file are subject to the Sun Industry Standards ++ * Source License Version 1.1 (the License); You may not use this file ++ * except in compliance with the License. You may obtain a copy of the ++ * License at http://www.openoffice.org/license.html. ++ * ++ * Software provided under this License is provided on an AS IS basis, ++ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, ++ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, ++ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. ++ * See the License for the specific provisions governing your rights and ++ * obligations concerning the Software. ++ * ++ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. ++ * ++ * Copyright: 2000 by Sun Microsystems, Inc. ++ * ++ * All Rights Reserved. ++ * ++ * Contributor(s): Michael Meeks, Jayant Madavi ++ * ++ * ++ ************************************************************************/ ++ ++#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_ ++#define _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_ ++#include <glib-object.h> ++ ++// Initializes the API below, returns false if not available ++bool EApiInit(); ++ ++G_BEGIN_DECLS ++ ++// This header defined all the API methods as ++// function pointers instead of real functions ++// this will all evaporate as it is compiled generating ++// no symbol lookups or relocations, but giving code ++// clarity. ++ ++// We attempt to define a minimum API that we use: ++ ++// e-contact.h ++typedef void EContact; ++#define E_CONTACT(a) ((EContact *)(a)) ++#define E_TYPE_CONTACT (e_contact_get_type()) ++typedef int EContactField; ++ ++// e-source.h ++typedef void ESource; ++#define E_SOURCE(a) ((ESource *)(a)) ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++const char *(*e_source_peek_name) (ESource *source); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++const gchar *(*e_source_get_property) (ESource *source, ++ const gchar *property); ++ ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++GType (*e_contact_get_type) (void); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EContactField (*e_contact_field_id) (const char *field_name); ++ ++// e-source-list.h ++typedef void ESourceList; ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++GSList *(*e_source_list_peek_groups) (ESourceList *list); ++ ++// e-source-group.h ++typedef void ESourceGroup; ++#define E_SOURCE_GROUP(a) ((ESourceGroup *)(a)) ++ ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++GSList *(*e_source_group_peek_sources) (ESourceGroup *group); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++const char *(*e_source_group_peek_base_uri) (ESourceGroup *group); ++// e-book.h ++typedef enum { ++ E_BOOK_QUERY_IS, ++ E_BOOK_QUERY_CONTAINS, ++ E_BOOK_QUERY_BEGINS_WITH, ++ E_BOOK_QUERY_ENDS_WITH, ++} EBookQueryTest; ++ ++typedef void EBook; ++typedef void EBookQuery; ++ ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EBook *(*e_book_new) (ESource *source, ++ GError **error); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++gboolean (*e_book_open) (EBook *book, ++ gboolean only_if_exists, ++ GError **error); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++const char *(*e_book_get_uri) (EBook *book); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++ESource *(*e_book_get_source) (EBook *book); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++gboolean (*e_book_get_addressbooks) (ESourceList **addressbook_sources, ++ GError **error); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++gboolean (*e_book_get_contacts) (EBook *book, ++ EBookQuery *query, ++ GList **contacts, ++ GError **error); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++gboolean (*e_book_authenticate_user) (EBook *book, ++ const char *user, ++ const char *passwd, ++ const char *auth_method, ++ GError **error); ++ ++// e-book-query.h ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EBookQuery* (*e_book_query_field_exists) (EContactField field); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EBookQuery* (*e_book_query_field_test) (EContactField field, ++ EBookQueryTest test, ++ const char *value); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EBookQuery* (*e_book_query_and) (int nqs, EBookQuery **qs, gboolean unref); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EBookQuery* (*e_book_query_or) (int nqs, EBookQuery **qs, gboolean unref); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++EBookQuery* (*e_book_query_not) (EBookQuery *q, gboolean unref); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++void (*e_book_query_unref) (EBookQuery *q); ++#ifndef _EVOLUTION_ALREADY_DEFINED_ ++extern ++#endif ++char* (*e_book_query_to_string) (EBookQuery *q); ++G_END_DECLS ++#endif diff --git a/patches/evo2/connectivity-source-drivers-evoab1-5-nstatement-hxx.diff b/patches/evo2/connectivity-source-drivers-evoab1-5-nstatement-hxx.diff index 20c963f7f..2fea9b86a 100644 --- a/patches/evo2/connectivity-source-drivers-evoab1-5-nstatement-hxx.diff +++ b/patches/evo2/connectivity-source-drivers-evoab1-5-nstatement-hxx.diff @@ -1,6 +1,6 @@ --- /dev/null +++ connectivity/source/drivers/evoab1.5/NStatement.hxx -@@ -0,0 +1,229 @@ +@@ -0,0 +1,231 @@ +/************************************************************************* + * + * The Contents of this file are made available subject to the terms of @@ -96,7 +96,9 @@ +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif -+#include <libebook/e-book-query.h> ++#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_ ++#include "EApi.h" ++#endif + +namespace connectivity +{ |