This commit was manufactured by cvs2svn to create tag

'OOO_BUILD_2_0_1_3'.

25 files changed, 548 insertions, 211 deletions

diff --git a/bin/setup.in b/bin/setup.in
index 2ada13685..e240c0e40 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -33,14 +33,14 @@ SYSTEM_CAIRO=@SYSTEM_CAIRO@
 GLITZ_VER=@GLITZ_VER@
 HUNSPELL_UNO_SRC=@HUNSPELL_UNO_SRC@
 HUNSPELL_LIB_SRC=@HUNSPELL_LIB_SRC@
+AGFA_MONOTYPE_FONTS_SOURCE=@AGFA_MONOTYPE_FONTS_SOURCE@
 
 if test "z$BUILD_WIN32" != "z"; then
     CONFIGURE_OPTIONS="--with-lang=\"$OOO_LANGS\" --with-use-shell=tcsh \
 		       --without-gpc --enable-crashdump=no \
 		       --disable-directx --enable-build-mozilla \
-		       --disable-binfilter --without-myspell-dicts \
+		       --disable-binfilter \
 		       --with-ant-home=$BUILDDIR/apache-ant-1.6.5"
-
 else
     # We pull config options in from distro-specific config files, if present
     if test "z$DISTRO" != "z"; then
diff --git a/bin/unpack b/bin/unpack
index 656a17c1e..3c8e0c18b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -36,6 +36,19 @@ if test "z$SYSTEM_GCC" = "z"; then
     if test "z$BINUTILS_TARBALL" != "z"; then
 	check_tarball $BINUTILS_TARBALL
     fi
+
+    if test "x$DEJAVU_FONTS_VER" != "x"; then
+        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
+        DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
+        if test ! -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
+            echo "Installing DejaVu fonts"
+            mkdir -p $DEJAVU_FONTSDEST || exit 1;
+            cp -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
+            echo "done"
+        else
+            echo "Already have DejaVu fonts"
+        fi
+    fi
 fi
 check_tarball $OOO_TARBALL
 
@@ -71,6 +84,10 @@ fi
 
 echo "Unpacking OO.o build tree - [ go make some tea ] ..."
 tar $OOO_UNTAR_OPTIONS $SRCDIR/$OOO_TARBALL || exit 1
+if test -d ooa680-m1 -a ! -d OOO_2_0_1 ; then
+    echo "Linking rc5 to 2.0.1"
+    ln -sf ooa680-m1 OOO_2_0_1
+fi
 
 echo "Fixing unfortunate snafus"
 INDUSTRIAL_DIR=$OOBUILDDIR/ooo_custom_images/industrial/res/commandimagelist
@@ -234,6 +251,19 @@ if test "z$BUILD_WIN32" != "z"; then
             echo "Already have Agfa Monotype fonts"
         fi
     fi
+
+    if test "x$DEJAVU_FONTS_VER" != "x"; then
+        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
+        DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
+        if test ! -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
+            echo "Installing DejaVu fonts"
+            mkdir -p $DEJAVU_FONTSDEST || exit 1;
+            cp -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
+            echo "done"
+        else
+            echo "Already have DejaVu fonts"
+        fi
+fi
 fi
 
 if test "z$SYSTEM_GCC" = "z"; then
diff --git a/distro-configs/Mandriva64.conf.in b/distro-configs/Mandriva64.conf.in
index 001ce5684..11747b5a6 100644
--- a/distro-configs/Mandriva64.conf.in
+++ b/distro-configs/Mandriva64.conf.in
@@ -1,5 +1,4 @@
 --enable-gnome-vfs
---without-java
 --without-myspell-dicts
 --with-system-curl
 --with-system-db
diff --git a/distro-configs/translate-org-za-linux.conf.in b/distro-configs/translate-org-za-linux.conf.in
new file mode 100755
index 000000000..42008a3f9
--- /dev/null
+++ b/distro-configs/translate-org-za-linux.conf.in
@@ -0,0 +1,4 @@
+--enable-libsn
+--disable-odk
+--with-dict=ENUS,ENZA,AFZA,TNZA,XHZA,ZUZA
+--with-dejavu-fonts
diff --git a/patches/Makefile.am b/patches/Makefile.am
index 3798a0254..279858926 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=64bit a11y cairo evo2 mono src680 vba
+SUBDIRS=64bit OOO_2_0_1 a11y cairo evo2 mono src680 vba
 
 EXTRA_DIST=README apply.pl $(wildcard *.diff)
diff --git a/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff b/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff
index df01a0bec..964df5873 100644
--- a/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff
+++ b/patches/src680/buildfix-gcc41-friend-decl-i18npool.diff
@@ -8,7 +8,7 @@
 +    return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
 +};
 +
- class I18NPOOL_DLLPUBLIC LocaleData : public cppu::WeakImplHelper2
+ class LocaleData : public cppu::WeakImplHelper2
  <
  	XLocaleData,
 @@ -131,13 +135,7 @@
diff --git a/patches/src680/buildfix-longnames-54730.diff b/patches/src680/buildfix-longnames-54730.diff
new file mode 100644
index 000000000..f2062b76d
--- /dev/null
+++ b/patches/src680/buildfix-longnames-54730.diff
@@ -0,0 +1,58 @@
+--- solenv/bin/modules/installer/languages.pm.all_lang	2005-09-08 05:04:40.000000000 -0400
++++ solenv/bin/modules/installer/languages.pm	2005-10-23 09:33:18.000000000 -0400
+@@ -64,6 +64,12 @@
+ 		$installer::globals::unixmultipath = $installer::globals::languagelist;
+ 		$installer::globals::unixmultipath =~ s/\,/\_/g;	# hashes not allowed, comma to underline
+ 		$installer::globals::alllanguagesinproductarrayref = installer::converter::convert_stringlist_into_array(\$installer::globals::unixmultipath, "_");
++
++		$installer::globals::unixmultipath_orig = $installer::globals::unixmultipath;
++		if (length($installer::globals::unixmultipath) > 120) {
++			chomp(my $shorter = `echo $installer::globals::unixmultipath | md5sum | sed -e "s/  -//g"` );
++			$installer::globals::unixmultipath = $shorter;
++		}
+ 	}	
+ 	
+ 	while ($first =~ /^(\S+)\#(\S+?)$/)	# Minimal matching, to keep the order of languages
+--- solenv/bin/modules/installer/globals.pm.all_lang	2005-10-20 14:49:34.000000000 -0400
++++ solenv/bin/modules/installer/globals.pm	2005-10-23 09:15:28.000000000 -0400
+@@ -124,6 +124,7 @@
+ 	$addpackagelist = "";
+ 	$is_unix_multi = 0;
+ 	$unixmultipath = "";
++	$unixmultipath_orig = "";
+ 	$alllanguagesinproductarrayref = "";
+ 	$shiptestdirectory = "";
+ 	$makelinuxlinkrpm = 0;
+--- solenv/bin/make_installer.pl.all_lang	2005-10-20 14:49:34.000000000 -0400
++++ solenv/bin/make_installer.pl	2005-10-23 09:31:02.000000000 -0400
+@@ -515,13 +515,29 @@
+ 	else { $logminor = $installer::globals::minor; }
+ 
+ 	my $loglanguagestring = $$languagestringref;
+-	if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath; }
++	if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath_orig; }
++
++	my $loglanguagestring_orig = $loglanguagestring;
++	if (length($loglanguagestring) > 120) {
++	    chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/  -//g"`);
++	    $loglanguagestring = $shorter;
++	}
+ 
+ 	$installer::globals::logfilename = "log_" . $installer::globals::build . "_" . $logminor . "_" . $loglanguagestring . ".log";
+ 
+ 	if (( ! $installer::globals::is_unix_multi ) || ( $isfirstrun )) { $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator; }
+ 
+ 	installer::systemactions::create_directory($loggingdir);
++
++	if ($loglanguagestring ne $loglanguagestring_orig) {
++	    (my $dir = $loggingdir) =~ s!/$!!;
++	    open(my $F1, "> $dir.dir");
++	    open(my $F2, "> " . $loggingdir . $installer::globals::logfilename . '.file');
++	    my @s = map { "$_\n" } split('_', $loglanguagestring_orig);
++	    print $F1 @s;
++	    print $F2 @s;
++	}
++
+ 	$installer::globals::exitlog = $loggingdir;
+ 
+ 	##############################################################
diff --git a/patches/src680/gallery-not-found.diff b/patches/src680/gallery-not-found.diff
new file mode 100644
index 000000000..f36152be5
--- /dev/null
+++ b/patches/src680/gallery-not-found.diff
@@ -0,0 +1,38 @@
+--- svx/source/gallery2/gallery1.cxx.orig	2006-01-06 21:04:31.000000000 +0100
++++ svx/source/gallery2/gallery1.cxx	2006-01-09 20:04:52.000000000 +0100
+@@ -396,7 +396,8 @@
+ 
+ 			if( xContentAccess.is() )
+ 			{
+-				while( xResultSet->next() )
++				xResultSet->first();
++				do
+ 				{
+ 					INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() );
+ 					
+@@ -519,6 +520,7 @@
+ 	                    }
+ 					}
+ 				}
++				while( xResultSet->next() );
+ 			}
+ 		}
+ 	}
+@@ -695,10 +697,14 @@
+ 
+ 	if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
+ 	{
+-		nLastFileNumber=nNumFrom > nLastFileNumber ? nNumFrom : ++nLastFileNumber;
++		if (nNumFrom > nLastFileNumber)
++			nLastFileNumber=nNumFrom;
++		else
++			nLastFileNumber++;
++		    
+ 		GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
+-															  nLastFileNumber,
+-															  FALSE, FALSE, TRUE, 0, FALSE );
++								      nLastFileNumber,
++								      FALSE, FALSE, TRUE, 0, FALSE );
+ 
+ 		aThemeList.Insert( pNewEntry, LIST_APPEND );
+ 		delete( new GalleryTheme( this, pNewEntry ) );
diff --git a/patches/src680/gentoo-pax-fix.diff b/patches/src680/gentoo-pax-fix.diff
new file mode 100644
index 000000000..e0b4700e6
--- /dev/null
+++ b/patches/src680/gentoo-pax-fix.diff
@@ -0,0 +1,26 @@
+--- solenv/inc/unxlngi4.mk.orig	2005-10-29 17:09:48.000000000 +0200
++++ solenv/inc/unxlngi4.mk	2005-10-29 17:18:46.000000000 +0200
+@@ -138,8 +138,8 @@
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+--- solenv/inc/unxlngi6.mk.orig	2005-10-29 17:16:27.000000000 +0200
++++ solenv/inc/unxlngi6.mk	2005-10-29 17:19:08.000000000 +0200
+@@ -147,8 +147,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
diff --git a/patches/src680/jurt-ensure-dot-so-at-libname.diff b/patches/src680/jurt-ensure-dot-so-at-libname.diff
deleted file mode 100644
index 812825449..000000000
--- a/patches/src680/jurt-ensure-dot-so-at-libname.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-? a
-Index: NativeLibraryLoader.java
-===================================================================
-RCS file: /cvs/udk/jurt/com/sun/star/lib/util/NativeLibraryLoader.java,v
-retrieving revision 1.9
-diff -u -u -r1.9 NativeLibraryLoader.java
---- jurt/com/sun/star/lib/util/NativeLibraryLoader.java	7 Sep 2005 19:05:02 -0000	1.9
-+++ jurt/com/sun/star/lib/util/NativeLibraryLoader.java	5 Dec 2005 01:13:26 -0000
-@@ -69,6 +69,11 @@
-         if (path == null) {
-             // If the library cannot be found as a class loader resource, try
-             // the global System.loadLibrary as a last resort:
-+	    // rene: somehow (e.g. gcj-4.0.x/Linux/ppc, we do *not* get the .so
-+	    // add a extra check.
-+	    if(!libname.endsWith(".so")) {
-+		libname = libname + ".so";
-+	    }
-             System.loadLibrary(libname);
-         } else {
-             System.load(path.getAbsolutePath());
diff --git a/patches/src680/jvmfwk-gij-4.1.diff b/patches/src680/jvmfwk-gij-4.1.diff
new file mode 100644
index 000000000..c35a40ea7
--- /dev/null
+++ b/patches/src680/jvmfwk-gij-4.1.diff
@@ -0,0 +1,38 @@
+--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.ark	2005-12-21 14:57:59.000000000 +0000
++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2005-12-21 14:58:36.000000000 +0000
+@@ -128,11 +128,13 @@
+     rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
+     rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
+     rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
++    rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
+     if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
+             || sVendor2.equals(pInfo->sVendor) == sal_True
+             || sVendor3.equals(pInfo->sVendor) == sal_True
+             || sVendor4.equals(pInfo->sVendor) == sal_True
+-            || sVendor5.equals(pInfo->sVendor) == sal_True))
++            || sVendor5.equals(pInfo->sVendor) == sal_True
++	    || sVendor6.equals(pInfo->sVendor) == sal_True))
+         return 0;
+     
+     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
+--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.ark	2005-12-21 17:09:49.000000000 +0000
++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2005-12-21 17:10:16.000000000 +0000
+@@ -57,6 +57,8 @@
+         "bin/gij",
+ 	"gij-4.0",
+ 	"bin/gij-4.0"
++	"gij-4.1",
++	"bin/gij-4.1"
+     };
+     *size = sizeof (ar) / sizeof (char*);
+     return ar;
+@@ -65,7 +67,8 @@
+ char const* const* GnuInfo::getRuntimePaths(int * size)
+ {
+     static char const* ar[]= {
+-          "/lib/libgcj.so.6"
++          "/lib/libgcj.so.7"
++        , "/lib/libgcj.so.6"
+ #if 0   //unreliable
+ 	, "/lib/libgcj.so.5"
+         , "/lib/libgcj.so.4"
diff --git a/patches/src680/mandriva-java32_64.diff b/patches/src680/mandriva-java32_64.diff
new file mode 100644
index 000000000..2a2c67638
--- /dev/null
+++ b/patches/src680/mandriva-java32_64.diff
@@ -0,0 +1,18 @@
+--- desktop/scripts/soffice.sh.java32_64	2005-09-08 19:02:48.000000000 +0200
++++ desktop/scripts/soffice.sh	2005-09-19 15:27:10.000000000 +0200
+@@ -147,6 +147,15 @@
+     ;;
+ esac
+ 
++# 32-bit JAVA kludge for x86_64 platforms with native JRE
++if [ "`uname -m`" = "x86_64" -a -n "$JAVA32_HOME" ]; then
++    case `/usr/bin/file "$sd_prog/$sd_binary"` in
++    *"ELF 32"*)
++        export JAVA_HOME=$JAVA32_HOME
++        ;;
++    esac
++fi
++
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/javaldx" ] ; then
+     java_ld_library_path=`"$sd_prog/javaldx"`
diff --git a/patches/src680/pld-splash.diff b/patches/src680/pld-splash.diff
new file mode 100644
index 000000000..12adeb859
--- /dev/null
+++ b/patches/src680/pld-splash.diff
@@ -0,0 +1,43 @@
+Index: svx/prj/d.lst
+===================================================================
+RCS file: /cvs/graphics/svx/prj/d.lst,v
+retrieving revision 1.108
+diff -u -r1.108 d.lst
+--- svx/prj/d.lst	9 Dec 2004 16:36:45 -0000	1.108
++++ svx/prj/d.lst	16 Dec 2004 12:43:47 -0000
+@@ -55,7 +55,7 @@
+ ..\res\cjkintro.bmp %COMMON_DEST%\pck%_EXT%\starsuite_bitmap\intro.bmp
+ ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp
+ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
+-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
++..\res\openintro_pld.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+ ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ 
+ mkdir: %_DEST%\inc%_EXT%\svx
+Index: svx/source/intro/ooo.src
+===================================================================
+RCS file: /cvs/graphics/svx/source/intro/ooo.src,v
+retrieving revision 1.11
+diff -u -r1.11 ooo.src
+--- svx/source/intro/ooo.src	7 Jan 2005 09:49:30 -0000	1.11
++++ svx/source/intro/ooo.src	1 Feb 2005 16:48:49 -0000
+@@ -48,8 +48,8 @@
+ #include "svxids.hrc"
+ #include "intro.hrc"
+ 
+-#ifdef BUILD_SPECIAL
+-#define OOO_VENDOR "Sun Microsystems Inc."
++#if 1
++#define OOO_VENDOR "PLD/Linux Team"
+ #else
+ //#define OOO_VENDOR "my company"
+ #endif
+@@ -56,7 +56,7 @@
+ 
+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
+ {
+-	File = "openabout.bmp" ;
++	File = "openabout_pld.bmp" ;
+ };
+ 
+ String RID_APPTITLE
diff --git a/patches/src680/speed-uiconfig.diff b/patches/src680/speed-uiconfig.diff
deleted file mode 100644
index d3b6381dc..000000000
--- a/patches/src680/speed-uiconfig.diff
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: ucb/source/ucp/file/filrset.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/filrset.cxx,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 filrset.cxx
---- ucb/source/ucp/file/filrset.cxx	9 Sep 2005 15:27:30 -0000	1.17
-+++ ucb/source/ucp/file/filrset.cxx	26 Oct 2005 13:32:34 -0000
-@@ -322,12 +322,12 @@ XResultSet_impl::OneMore(
- 	osl::FileBase::RC err;
- 	sal_Bool IsRegular;
- 	rtl::OUString aUnqPath;
--	osl::DirectoryItem  m_aDirIte;
-+	osl::DirectoryItem  aDirItem;
- 	Reference< sdbc::XRow > aRow;
- 
- 	while( true )
- 	{
--		err = m_aFolder.getNextItem( m_aDirIte );
-+		err = m_aFolder.getNextItem( aDirItem );
- 
- 		if( err == osl::FileBase::E_NOENT || err == osl::FileBase::E_INVAL )
- 		{
-@@ -337,7 +337,7 @@ XResultSet_impl::OneMore(
- 		}
- 		else if( err == osl::FileBase::E_None )
- 		{
--			aRow = m_pMyShell->getv( -1,this,m_sProperty,m_aDirIte,aUnqPath,IsRegular );
-+			aRow = m_pMyShell->getv( -1,this,m_sProperty,aDirItem,aUnqPath,IsRegular );
- 
- 			if( m_nOpenMode == OpenMode::DOCUMENTS && IsRegular )
- 			{
-Index: ucb/source/ucp/file/shell.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/shell.cxx,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 shell.cxx
---- ucb/source/ucp/file/shell.cxx	9 Sep 2005 15:29:56 -0000	1.84
-+++ ucb/source/ucp/file/shell.cxx	26 Oct 2005 13:32:35 -0000
-@@ -1119,8 +1119,8 @@ shell::getv( sal_Int32 CommandId,
- {
- 	uno::Sequence< uno::Any > seq( properties.getLength() );
- 
--	sal_Int32 n_Mask;
--	getMaskFromProperties( n_Mask,properties );
-+	sal_Int32 n_Mask = getMaskFromProperties( properties );
-+	
- 	osl::FileStatus aFileStatus( n_Mask );
- 
- 	osl::DirectoryItem aDirItem;
-@@ -2203,15 +2203,21 @@ sal_Bool SAL_CALL shell::ensuredir( sal_
- //
- 
- 
--void SAL_CALL
-+sal_Int32 SAL_CALL
- shell::getMaskFromProperties(
--    sal_Int32& n_Mask,
--    const uno::Sequence< beans::Property >& seq )
-+    const uno::Sequence< beans::Property >& seq,
-+	bool *bNameOnly)
- {
--    n_Mask = 0;
-+    sal_Int32 n_Mask = 0;
-+	if(bNameOnly)
-+		*bNameOnly = false;
-     for(sal_Int32 j = 0; j < seq.getLength(); ++j) {
-         if(seq[j].Name == Title)
-+		{
-             n_Mask |= FileStatusMask_FileName;
-+			if(bNameOnly)
-+				*bNameOnly = seq.getLength() == 1;
-+		}
-         else if(seq[j].Name == CasePreservingURL)
-             n_Mask |= FileStatusMask_FileURL;
-         else if(seq[j].Name == IsDocument ||
-@@ -2240,6 +2246,7 @@ shell::getMaskFromProperties(
- //         n_Mask |= FileStatusMask_FileSize;
- //         n_Mask |= FileStatusMask_Attributes;
-     }
-+	return n_Mask;
- }
- 
- 
-@@ -2534,44 +2541,52 @@ shell::getv(
- 	sal_Bool& aIsRegular )
- {
- 	uno::Sequence< uno::Any > seq( properties.getLength() );
-+	
-+	bool bNameOnly = false;
-+	sal_Int32 n_Mask = getMaskFromProperties( properties, &bNameOnly );
- 
--	sal_Int32 n_Mask;
--	getMaskFromProperties( n_Mask,properties );
-+	sal_Int32 n_RealMask = n_Mask;
-+	if ( !bNameOnly )
-+	{   // Always retrieve the type and the target URL because item might be a link
-+		n_RealMask |= ( FileStatusMask_FileURL |
-+						FileStatusMask_Type |
-+						FileStatusMask_LinkTargetURL );
-+	}
- 
--	// Always retrieve the type and the target URL because item might be a link
--	osl::FileStatus aFileStatus( n_Mask |
--                                 FileStatusMask_FileURL |
--                                 FileStatusMask_Type |
--                                 FileStatusMask_LinkTargetURL );
-+	osl::FileStatus aFileStatus( n_RealMask );
-+	
- 	aDirItem.getFileStatus( aFileStatus );
- 	aUnqPath = aFileStatus.getFileURL();
- 
- 	// If the directory item type is a link retrieve the type of the target
- 
--	if ( aFileStatus.getFileType() == osl::FileStatus::Link )
-+	if ( n_Mask & FileStatusMask_Type )
- 	{
--        // Assume failure
--		osl::FileBase::RC	result = osl::FileBase::E_INVAL;
--		osl::DirectoryItem	aTargetItem;
--		osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
--		if ( aTargetItem.is() )
--		{
--			osl::FileStatus	aTargetStatus( FileStatusMask_Type );
--
--			if ( osl::FileBase::E_None ==
--                 ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
--				aIsRegular =
--                    aTargetStatus.getFileType() == osl::FileStatus::Regular;
--		}
--
--		// FIXME: aIsRegular undefined in error case.
--        // Don't know how to transport error
--		OSL_ENSURE( osl::FileBase::E_None == result,
--                    "shell::getv: Link target can't be retrieved."
--                    " Missing error handling !!!" );
-+		if ( aFileStatus.getFileType() == osl::FileStatus::Link )
-+		{
-+			// Assume failure
-+			osl::FileBase::RC	result = osl::FileBase::E_INVAL;
-+			osl::DirectoryItem	aTargetItem;
-+			osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
-+			if ( aTargetItem.is() )
-+			{
-+				osl::FileStatus	aTargetStatus( FileStatusMask_Type );
-+
-+				if ( osl::FileBase::E_None ==
-+					 ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
-+					aIsRegular =
-+						aTargetStatus.getFileType() == osl::FileStatus::Regular;
-+			}
-+
-+			// FIXME: aIsRegular undefined in error case.
-+			// Don't know how to transport error
-+			OSL_ENSURE( osl::FileBase::E_None == result,
-+						"shell::getv: Link target can't be retrieved."
-+						" Missing error handling !!!" );
-+		}
-+		else
-+			aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
- 	}
--	else
--		aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
- 
- 	registerNotifier( aUnqPath,pNotifier );
- 	insertDefaultProperties( aUnqPath );
-Index: ucb/source/ucp/file/shell.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/shell.hxx,v
-retrieving revision 1.21
-diff -u -p -u -r1.21 shell.hxx
---- ucb/source/ucp/file/shell.hxx	9 Sep 2005 15:30:10 -0000	1.21
-+++ ucb/source/ucp/file/shell.hxx	26 Oct 2005 13:32:35 -0000
-@@ -583,10 +583,10 @@ namespace fileaccess {
- 		 *  osl::DirectoryItem::getFileStatus fills the required fields.
- 		 */
- 
--		void SAL_CALL
-+		sal_Int32 SAL_CALL
- 		getMaskFromProperties(
--			sal_Int32& n_Mask,
--			const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq );
-+			const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
-+			bool *bNameOnly = NULL);
- 
- 
- 		void SAL_CALL
diff --git a/patches/src680/translate-org-za-installer-branding.diff b/patches/src680/translate-org-za-installer-branding.diff
new file mode 100755
index 000000000..f582f9429
--- /dev/null
+++ b/patches/src680/translate-org-za-installer-branding.diff
@@ -0,0 +1,86 @@
+--- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
++++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
+@@ -353,7 +353,13 @@
+ 	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_translateorgza.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_translateorgza.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_translateorgza.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_translateorgza.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_translateorgza.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_translateorgza.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+ 
+--- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
++++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
+@@ -26,9 +26,9 @@
+ 			USE_FILEVERSION 1
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_translateorgza.bmp
++			DOWNLOADBITMAP	ooobitmap_translateorgza.bmp
++			DOWNLOADSETUPICO	ooosetup_translateorgza.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -70,9 +70,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_translateorgza.bmp
++			DOWNLOADBITMAP	ooobitmap_translateorgza.bmp
++			DOWNLOADSETUPICO	ooosetup_translateorgza.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -113,9 +113,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_translateorgza.bmp
++			DOWNLOADBITMAP	ooobitmap_translateorgza.bmp
++			DOWNLOADSETUPICO	ooosetup_translateorgza.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -141,9 +141,9 @@
+             PACKAGEREVISION 1
+             LICENSENAME LGPL
+             NOVERSIONINDIRNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_translateorgza.bmp
++            DOWNLOADBITMAP ooobitmap_translateorgza.bmp
++            DOWNLOADSETUPICO ooosetup_translateorgza.ico
+         }
+         active 1
+         compression 5
+@@ -169,9 +169,9 @@
+             LICENSENAME LGPL, SISSL
+             NOVERSIONINDIRNAME 0
+             NOSPACEINDIRECTORYNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_translateorgza.bmp
++            DOWNLOADBITMAP ooobitmap_translateorgza.bmp
++            DOWNLOADSETUPICO ooosetup_translateorgza.ico
+         }
+         active 1
+         compression 5
diff --git a/patches/vba/sc-source-ui-vba-vbaarraywrapper-cxx.diff b/patches/vba/sc-source-ui-vba-vbaarraywrapper-cxx.diff
new file mode 100644
index 000000000..fbef8a576
--- /dev/null
+++ b/patches/vba/sc-source-ui-vba-vbaarraywrapper-cxx.diff
@@ -0,0 +1,27 @@
+*** /dev/null	2005-12-16 09:19:58.720346000 +0000
+--- sc/source/ui/vba/vbaarraywrapper.cxx	2005-12-21 16:56:35.000000000 +0000
+***************
+*** 0 ****
+--- 1,22 ----
++ #include "vbaarraywrapper.hxx"
++ using namespace ::org::openoffice;
++ using namespace ::com::sun::star;
++ 
++ ScArrayWrapper::ScArrayWrapper( const uno::Any& aArray, sal_Bool bZeroBased ) : maArray( aArray ), mbZeroBased( bZeroBased )
++ {
++ }
++ 
++ 
++ sal_Bool SAL_CALL 
++ ScArrayWrapper::getIsZeroIndex() throw (css::uno::RuntimeException)
++ {
++ 	return mbZeroBased;
++ }
++ 
++ 
++ css::uno::Any SAL_CALL 
++ ScArrayWrapper::getArray() throw (css::uno::RuntimeException)
++ {
++ 	return maArray;
++ }
++ 
diff --git a/patches/vba/sc-source-ui-vba-vbaarraywrapper-hxx.diff b/patches/vba/sc-source-ui-vba-vbaarraywrapper-hxx.diff
new file mode 100644
index 000000000..fe9540f65
--- /dev/null
+++ b/patches/vba/sc-source-ui-vba-vbaarraywrapper-hxx.diff
@@ -0,0 +1,25 @@
+*** /dev/null	2005-12-16 09:19:58.720346000 +0000
+--- sc/source/ui/vba/vbaarraywrapper.hxx	2005-12-21 16:56:35.000000000 +0000
+***************
+*** 0 ****
+--- 1,20 ----
++ #ifndef SC_VBA_ARRAYWRAPPER_HXX
++ #define SC_VBA_ARRAYWRAPPER_HXX
++ #include <cppuhelper/implbase1.hxx>
++ #include <org/openoffice/vba/XArrayWrapper.hpp>
++ #include "vbahelper.hxx"
++ 
++ typedef ::cppu::WeakImplHelper1<oo::vba::XArrayWrapper > ArrayWrapperImpl_BASE;
++ 
++ class ScArrayWrapper : public ArrayWrapperImpl_BASE
++ {		
++ 	css::uno::Any maArray;
++ 	sal_Bool mbZeroBased;
++ public:
++ 	ScArrayWrapper( const css::uno::Any& aArray, sal_Bool bZeroBased );
++ 	// Attributes
++ 	virtual ::sal_Bool SAL_CALL getIsZeroIndex() throw (css::uno::RuntimeException);
++ 	virtual css::uno::Any SAL_CALL getArray() throw (css::uno::RuntimeException);
++ };
++ 
++ #endif //SC_VBA_WINDOW_HXX
diff --git a/patches/vba/vba-basic-multidim-uno-arraywrap.diff b/patches/vba/vba-basic-multidim-uno-arraywrap.diff
new file mode 100644
index 000000000..11ceca7e7
--- /dev/null
+++ b/patches/vba/vba-basic-multidim-uno-arraywrap.diff
@@ -0,0 +1,149 @@
+Index: basic/source/classes/sbunoobj.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/classes/sbunoobj.cxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 sbunoobj.cxx
+--- basic/source/classes/sbunoobj.cxx	29 Sep 2005 16:10:51 -0000	1.35
++++ basic/source/classes/sbunoobj.cxx	21 Dec 2005 17:08:46 -0000
+@@ -61,6 +61,9 @@
+ #include <rtl/ustrbuf.hxx>
+ #include <rtl/strbuf.hxx>
+ 
++#ifdef ENABLE_VBA
++#include <org/openoffice/vba/XArrayWrapper.hpp>
++#endif ENABLE_VBA
+ 
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/uno/DeploymentException.hpp>
+@@ -467,11 +530,93 @@ SbxDataType unoToSbxType( const Referenc
+     }
+ 	return eRetType;
+ }
++#ifdef ENABLE_VBA
++void unoToSbxValue( SbxVariable* pVar, const Any& aValue );
++static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex )
++{
++	Type aType = aValue.getValueType();
++	TypeClass eTypeClass = aType.getTypeClass();
++
++	sal_Int32 indicesIndex = indices.getLength() -1; 
++	sal_Int32 dimCopy = dimension;
++
++	if ( eTypeClass == TypeClass_SEQUENCE )
++	{
++		Reference< XIdlClass > xIdlTargetClass = TypeToIdlClass( aType );
++		Reference< XIdlArray > xIdlArray = xIdlTargetClass->getArray();
++		sal_Int32 nLen = xIdlArray->getLen( aValue );
++		for ( sal_Int32 index = 0; index < nLen; ++index )
++		{
++			Any aElementAny = xIdlArray->get( aValue, (UINT32)index );
++			// This detects the dimension were currently processing
++			if ( dimCopy == dimension )
++			{
++				++dimCopy;
++				if ( sizes.getLength() < dimCopy )
++				{
++					sizes.realloc( sizes.getLength() + 1 );	
++					sizes[ sizes.getLength() - 1 ] = nLen;
++					indices.realloc( indices.getLength() + 1 );
++					indicesIndex = indices.getLength() - 1;
++				}
++			}
++
++			if ( bIsZeroIndex )
++				indices[ dimCopy - 1 ] = index;
++			else 
++				indices[ dimCopy - 1] = index + 1;
++
++			implSequenceToMultiDimArray( pArray, indices, sizes, aElementAny, dimCopy, bIsZeroIndex );
++		}
++		
++	}
++	else
++	{
++		if ( indices.getLength() < 2 ) 
++		{
++			// #TODO find a suitable error and how to set it
++			OSL_TRACE("Error not a MultDim Array ");	
++			return;
++		}
++
++		if ( !pArray )
++		{
++			SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() );
++			pArray = new SbxDimArray( eSbxElementType );
++			sal_Int32 nIndexLen = indices.getLength();
++		
++			// Dimension the array
++			for ( sal_Int32 index = 0; index < nIndexLen; ++index )
++			{
++				if ( bIsZeroIndex )
++					pArray->unoAddDim32( 0, sizes[ index ] - 1);
++				else
++					pArray->unoAddDim32( 1, sizes[ index ] );
++
++			}
++		}
++
++		if ( pArray )
++		{
++			SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() );
++			SbxVariableRef xVar = new SbxVariable( eSbxElementType );
++			unoToSbxValue( (SbxVariable*)xVar, aValue );
++
++			sal_Int32* pIndices = indices.getArray();
++			pArray->Put32( 	(SbxVariable*)xVar, pIndices );
++
++		}
++	}
++}
++#endif //ENABLE_VBA
+ 
+ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
+ {
+ 	Type aType = aValue.getValueType();
++#ifdef ENABLE_VBA
++	Type aArrayWrapperType = org::openoffice::vba::XArrayWrapper::static_type();
++#endif //ENABLE_VBA
+ 	TypeClass eTypeClass = aType.getTypeClass();	
+ 	switch( eTypeClass )
+ 	{
+ 		case TypeClass_TYPE:
+@@ -499,11 +643,36 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 			}
+ 		}
+ 		break;
+-
+ 		// Interfaces und Structs muessen in ein SbUnoObject gewrappt werden
+ 		case TypeClass_INTERFACE:
+ 		case TypeClass_STRUCT:
+ 		{
++#ifdef ENABLE_VBA
++			if ( aType == aArrayWrapperType )
++			{
++				Reference< org::openoffice::vba::XArrayWrapper > xWrap( aValue, UNO_QUERY ); 
++				if ( xWrap.is() )
++				{
++					SbxDimArray* pArray = NULL;
++					Sequence< sal_Int32 > indices;
++					Sequence< sal_Int32 > sizes;
++					sal_Int32 dimension = 0;
++					implSequenceToMultiDimArray( pArray, indices, sizes, xWrap->getArray() , dimension, xWrap->getIsZeroIndex() );
++					if ( pArray )
++					{
++						SbxDimArrayRef xArray = pArray;
++						USHORT nFlags = pVar->GetFlags();
++						pVar->ResetFlag( SBX_FIXED );
++						pVar->PutObject( (SbxDimArray*)xArray );
++						pVar->SetFlags( nFlags );
++					}
++					else
++						pVar->PutEmpty();
++					break;	
++				}
++					
++			}
++#endif //ENABLE_VBA
+ 			if( eTypeClass == TypeClass_STRUCT )
+ 			{
+ 				SbiInstance* pInst = pINST;
diff --git a/src/Makefile.am b/src/Makefile.am
index 374def779..a677847d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,8 @@ EXTRA_DIST=\
 	openintro_gentoo.bmp \
 	openintro_qilinux.bmp \
 	openabout_qilinux.png \
+	openintro_translateorgza.bmp \
+	openabout_translateorgza.png \
 	file-bug-24.png \
 	file-bug-16.png \
 	novell-team.png \
diff --git a/src/banner_nld.bmp b/src/banner_nld.bmp
new file mode 100644
index 000000000..0b9cb2953
--- /dev/null
+++ b/src/banner_nld.bmp
diff --git a/src/banner_translateorgza.bmp b/src/banner_translateorgza.bmp
new file mode 100755
index 000000000..5b2e6c6b5
--- /dev/null
+++ b/src/banner_translateorgza.bmp
diff --git a/src/ooobanner_nld.bmp b/src/ooobanner_nld.bmp
new file mode 100644
index 000000000..9aa6179bf
--- /dev/null
+++ b/src/ooobanner_nld.bmp
diff --git a/src/ooobitmap_nld.bmp b/src/ooobitmap_nld.bmp
new file mode 100644
index 000000000..6c998287a
--- /dev/null
+++ b/src/ooobitmap_nld.bmp
diff --git a/src/ooobitmap_translateorgza.bmp b/src/ooobitmap_translateorgza.bmp
new file mode 100755
index 000000000..1ffce7ac2
--- /dev/null
+++ b/src/ooobitmap_translateorgza.bmp
diff --git a/src/openabout_translateorgza.png b/src/openabout_translateorgza.png
new file mode 100644
index 000000000..a6d144c0f
--- /dev/null
+++ b/src/openabout_translateorgza.png