# NOTE:
-# - build requires about 8-9GB of disk space
+# - normal build requires little less than 4GB of disk space
+# - full debug build requires about 9GB of disk space
# TODO:
# - drop requirement on XFree86-static
# - drop requirement on nas-devel
Summary(pl): OpenOffice - potĂȘÂżny pakiet biurowy
Name: openoffice
Version: %{fullver}
-Release: 4
+Release: 6
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
Provides: libvcl%{subver}li.so
Obsoletes: %{name}-libs-gtk
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post,preun): %{name}-libs = %{epoch}:%{version}-%{release}
%description libs-kde
OpenOffice.org productivity suite - KDE Interface.
Provides: libvcl%{subver}li.so
Obsoletes: %{name}-libs-kde
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post,preun): %{name}-libs = %{epoch}:%{version}-%{release}
%description libs-gtk
OpenOffice.org productivity suite - GTK Interface.
--with-lang=ALL \
--with-x \
--without-fonts \
- --enable-crashdump=no \
--enable-fontconfig \
--enable-libsn \
--enable-libart \
--disable-rpath \
+%if 0%{?debug:1}
+ --enable-debug \
+ --enable-crashdump=yes \
+ --enable-symbols=FULL \
+%else
+ --enable-crashdump=no \
--disable-symbols \
+%endif
--with-num-cpus=$RPM_BUILD_NR_THREADS
"
cp -a Linux*Env.Set* vcl.kde
sed -i -e "s#\(.*WITH_WIDGETSET.*\)\".*\"\(.*\)#\1\"gtk\"\2#g" Linux*Env.Set*
sed -i -e "s#\(.*WIDGETSET_CFLAGS.*\)\".*\"\(.*\)#\1\"`pkg-config --cflags gtk+-2.0 gdk-pixbuf-xlib-2.0` -DWIDGETSET_GTK\"\2#g" Linux*Env.Set*
-sed -i -e "s#\(.*WIDGETSET_LIBS.*\)\".*\"\(.*\)#\1\"`pkg-config --libs gtk+-2.0 gdk-pixbuf-xlib-2.0`\"\2#g" LinuxIntelEnv.Set*
+sed -i -e "s#\(.*WIDGETSET_LIBS.*\)\".*\"\(.*\)#\1\"`pkg-config --libs gtk+-2.0 gdk-pixbuf-xlib-2.0`\"\2#g" Linux*Env.Set*
set +e
. ./Linux*Env.Set.sh
cd vcl
%postun
fontpostinst TTF %{_fontsdir}/%{name}
+%post libs
+if [ -f %{_libdir}/%{name}/program/libvcl%{subver}li-kde.so ]; then
+ ln -sf libvcl%{subver}li-kde.so %{_libdir}/%{name}/program/libvcl%{subver}li.so
+fi
+if [ -f %{_libdir}/%{name}/program/libvcl%{subver}li-gtk.so ]; then
+ ln -sf libvcl%{subver}li-gtk.so %{_libdir}/%{name}/program/libvcl%{subver}li.so
+fi
+
%preun libs-kde
rm -f %{_libdir}/%{name}/program/libvcl%{subver}li.so
+++ /dev/null
---- oo_1.0.1_src/setup2/jsnative/nunxos.cxx.so-ooo-coexist 2001-10-10 18:36:11.000000000 +0200
-+++ oo_1.0.1_src/setup2/jsnative/nunxos.cxx 2002-08-22 21:54:44.000000000 +0200
-@@ -168,7 +168,7 @@ void UnxOS::Terminate()
- void UnxOS::GetSVersion( char* buf, int len )
- {
- strcpy( buf, getenv("HOME") );
-- strcat( buf, "/.sversionrc" );
-+ strcat( buf, "/.OOoversionrc" );
- }
-
- //DONE
---- oo_1.0.1_src/setup2/mow/source/loader/loader.c.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
-+++ oo_1.0.1_src/setup2/mow/source/loader/loader.c 2002-08-22 22:01:16.000000000 +0200
-@@ -152,7 +152,7 @@ typedef const char* (*FncFindArch)(const
-
- #define PATCH_FILE "patch.inf"
- #define INSTDBINF_FILE "instdb.ins"
--#define SVERSION_FILE ".sversionrc"
-+#define SVERSION_FILE ".OOoversionrc"
-
- BOOL m_bNoJunk = FALSE;
- BOOL m_bUseX = TRUE;
---- oo_1.0.1_src/setup2/script/linux/1.0.0/webinstdb.inf.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
-+++ oo_1.0.1_src/setup2/script/linux/1.0.0/webinstdb.inf 2002-08-22 21:54:44.000000000 +0200
-@@ -78,11 +78,11 @@ End
-
- HelpText gid_Help_WrongSetup
- ID = "";
-- Text = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found).";
-+ Text = "The application is already installed on your system (a OOoversion.ini or an sofficerc file with a matching entry has been found).";
- ID (49) = "";
-- Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
-+ Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
- ID (33) = "";
-- Text (33) = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier sversion.ini ou sofficerc a été détectée).";
-+ Text (33) = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier OOoversion.ini ou sofficerc a été détectée).";
- End
-
- HelpText gid_Help_Migration
-@@ -8431,7 +8431,7 @@ End
-
- Profile gid_Profile_Sversion_Ini
- ModuleID = gid_Module_Root;
-- Name = ".sversionrc";
-+ Name = ".OOoversionrc";
- Dir = PREDEFINED_CONFIGDIR;
- End
-
-@@ -12383,7 +12383,7 @@ ProfileItem gid_Profileitem_Bootstrap_Lo
- ProfileID = gid_Profile_Bootstrap_Ini;
- Section = "Bootstrap";
- Key = "Location";
-- Value = "$(SYSUSERCONFIG)/.sversionrc";
-+ Value = "$(SYSUSERCONFIG)/.OOoversionrc";
- Order = 2;
- End
-
---- oo_1.0.1_src/setup2/script/linux/1.0.1/webinstdb.inf.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
-+++ oo_1.0.1_src/setup2/script/linux/1.0.1/webinstdb.inf 2002-08-22 21:54:44.000000000 +0200
-@@ -74,11 +74,11 @@ End
-
- HelpText gid_Help_WrongSetup
- ID = "";
-- Text = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found).";
-+ Text = "The application is already installed on your system (a OOoversion.ini or an sofficerc file with a matching entry has been found).";
- ID (49) = "";
-- Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
-+ Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
- ID (33) = "";
-- Text (33) = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier sversion.ini ou sofficerc a été détectée).";
-+ Text (33) = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier OOoversion.ini ou sofficerc a été détectée).";
- End
-
- HelpText gid_Help_Migration
-@@ -1986,7 +1986,7 @@ End
-
- Profile gid_Profile_Sversion_Ini
- ModuleID = gid_Module_Root;
-- Name = ".sversionrc";
-+ Name = ".OOoversionrc";
- Dir = PREDEFINED_CONFIGDIR;
- End
-
-@@ -12055,7 +12055,7 @@ ProfileItem gid_Profileitem_Bootstrap_Lo
- ProfileID = gid_Profile_Bootstrap_Ini;
- Section = "Bootstrap";
- Key = "Location";
-- Value = "$(SYSUSERCONFIG)/.sversionrc";
-+ Value = "$(SYSUSERCONFIG)/.OOoversionrc";
- Order = 2;
- End
-
---- oo_1.0.1_src/setup2/script/linux/1.1.1/webinstdb.inf.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
-+++ oo_1.0.1_src/setup2/script/linux/1.1.1/webinstdb.inf 2002-08-22 21:54:44.000000000 +0200
-@@ -74,11 +74,11 @@ End
-
- HelpText gid_Help_WrongSetup
- ID = "PAGE_WRONGSETUP";
-- Text = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found).";
-+ Text = "The application is already installed on your system (a Oooversion.ini or an sofficerc file with a matching entry has been found).";
- ID (49) = "";
-- Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
-+ Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
- ID (33) = "";
-- Text (33) = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier sversion.ini ou sofficerc a été détectée).";
-+ Text (33) = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier OOoversion.ini ou sofficerc a été détectée).";
- End
-
- HelpText gid_Help_Migration
-@@ -2025,7 +2025,7 @@ End
-
- Profile gid_Profile_Sversion_Ini
- ModuleID = gid_Module_Root;
-- Name = ".sversionrc";
-+ Name = ".OOoversionrc";
- Dir = PREDEFINED_CONFIGDIR;
- End
-
-@@ -13854,7 +13854,7 @@ ProfileItem gid_Profileitem_Bootstrap_Lo
- ProfileID = gid_Profile_Bootstrap_Ini;
- Section = "Bootstrap";
- Key = "Location";
-- Value = "$(SYSUSERCONFIG)/.sversionrc";
-+ Value = "$(SYSUSERCONFIG)/.OOoversionrc";
- Order = 2;
- End
-
---- oo_1.0.1_src/setup2/source/custom/jvmsetup/loader/jvmapp.cxx.so-ooo-coexist 2001-12-17 13:39:27.000000000 +0100
-+++ oo_1.0.1_src/setup2/source/custom/jvmsetup/loader/jvmapp.cxx 2002-08-22 21:54:44.000000000 +0200
-@@ -185,9 +185,9 @@ MySiCustomEnvironment::MySiCustomEnviron
-
- SiDirEntry aVersionfile(oStrConfigDir);
- #ifdef UNX
-- aVersionfile += UniString::CreateFromAscii(".sversionrc");
-+ aVersionfile += UniString::CreateFromAscii(".OOoversionrc");
- #else
-- aVersionfile += UniString::CreateFromAscii("sversion.ini");
-+ aVersionfile += UniString::CreateFromAscii("OOoversion.ini");
- #endif
-
- Config aVCfg( aVersionfile.GetFullUni() );
---- oo_1.0.1_src/setup2/wrapper/install.sh.so-ooo-coexist 2002-06-07 16:02:05.000000000 +0200
-+++ oo_1.0.1_src/setup2/wrapper/install.sh 2002-08-22 21:54:44.000000000 +0200
-@@ -82,7 +82,7 @@ fi
- if test "$installtype" = INSTALL_NORMAL; then
-
- # Remove previous .sversionrc to prevent problems with previous versions
--oo_versionrc="$HOME/.sversionrc"
-+oo_versionrc="$HOME/.OOoversionrc"
- #if [ -f "$oo_versionrc" ]; then
- # rm -f $oo_versionrc
- #fi
---- oo_1.0.1_src/scp/source/office/files.scp.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
-+++ oo_1.0.1_src/scp/source/office/files.scp 2002-08-22 21:54:44.000000000 +0200
-@@ -1301,14 +1301,14 @@ End
-
- File GID_FILE_USER_RDB
- TXT_FILE_BODY;
-- Name = "user60.rdb";
-+ Name = "userOOo10.rdb";
- Dir = PREDEFINED_CONFIGDIR;
- Styles = (DELETE_ONLY);
- End
-
- File GID_FILE_PUNKT_USER_RDB
- TXT_FILE_BODY;
-- Name = ".user60.rdb";
-+ Name = ".userOOo10.rdb";
- Dir = PREDEFINED_CONFIGDIR;
- Styles = (DELETE_ONLY);
- End
---- oo_1.0.1_src/scp/source/office/profile.scp.so-ooo-coexist 2002-06-20 12:22:20.000000000 +0200
-+++ oo_1.0.1_src/scp/source/office/profile.scp 2002-08-22 21:54:44.000000000 +0200
-@@ -15,9 +15,9 @@ End
- Profile GID_PROFILE_SVERSION_INI
- ModuleID = GID_MODULE_ROOT;
- #ifdef UNX
-- Name = ".sversionrc";
-+ Name = ".OOoversionrc";
- #else
-- Name = "sversion.ini";
-+ Name = "OOoversion.ini";
- #endif
- Dir = PREDEFINED_CONFIGDIR;
- End
-@@ -121,9 +121,9 @@ End
- Order = 2;
- Key = "Location";
- #ifdef WNT
-- Value = "$SYSUSERCONFIG/sversion.ini";
-+ Value = "$SYSUSERCONFIG/OOoversion.ini";
- #else
-- Value = "$SYSUSERCONFIG/.sversionrc";
-+ Value = "$SYSUSERCONFIG/.OOoversionrc";
- #endif
- End
-
-@@ -276,9 +276,9 @@ ProfileItem GID_PROFILEITEM_SOFFICE_UNO_
- Order = 4;
- Key = "UNO_WRITERDB";
- #ifdef WNT
-- Value = "$SYSUSERCONFIG/user60.rdb";
-+ Value = "$SYSUSERCONFIG/userOOo10.rdb";
- #else
-- Value = "$SYSUSERCONFIG/.user60.rdb";
-+ Value = "$SYSUSERCONFIG/.userOOo10.rdb";
- #endif
- End
- #endif
---- oo_1.0.1_src/scp/source/office/setuphelp.lng.so-ooo-coexist 2002-08-21 21:18:25.000000000 +0200
-+++ oo_1.0.1_src/scp/source/office/setuphelp.lng 2002-08-22 21:54:44.000000000 +0200
-@@ -166,27 +166,27 @@
- 96 = "ĂŁĂĂĂĂĂ° ĂĂ ĂĂ ĂĂĂ€ĂĂŁĂ ĂĂĄĂĂĂĂĂ \n\nĂĄĂĄĂĂĂŠĂĄ ĂĂĄĂŹ ĂĂĄĂŁĂĂĂ ĂŁĂ€ ĂĂĄĂŁĂĂĄĂŠĂŁĂĂÂĄ ĂĂĄĂĂĂĂ ĂĂĄĂĂĂŠĂ Ă
ĂĄĂŹ ĂĂĄĂĂĄ ĂĂĄĂĂĂĂĂ \n\nĂĂ ĂŁĂĂĂĂĂ ĂĂĄĂĂŠĂĂ ĂĂĄĂŁĂĂĂĄĂĂ ĂĄĂĂĂ€ĂĂŁĂ ĂĂĄĂ
ĂĂĂĂ ĂĂŠĂ ĂĂĂ ĂĂĄĂŁĂĂĂ ĂŁĂ€ ĂŁĂĂĂĂĂ ĂĂĄĂŁĂĂĂĂĂ. ĂĂ€ĂĂĂ ĂŠĂĂĂĂ ĂĂŠĂ Ăà ãÀÄà ĂĂŁĂÀà ĂĂĄĂĂĂŠĂĄ ĂĂĄĂŹ ĂŁĂĂĂĂĂ ĂĄĂĄĂ
ĂĂĂĂĂĂ ĂĂĄĂĂĂĂ ĂĂ„ĂĂ ĂĂĄĂĂĂ ĂŁĂ€ ĂĂĄĂĂĂĂĂ."
-
- [STR_HELP_WRONGSETUP]
--01 = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found)."
--49 = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden)."
--07 = "ĂĂČĂź ïðÚëßÊÄĂÚÄ óÊÄ ñóĂčÄñĂČùóÄĂČ Ăą Ăà ÞÄé ßïÄðà öÚßĂĂßé ñÚñĂČĂ„ĂŹĂ„ (ßåĂà ðóÊÄà Îà éë sversion.ini ÚëÚ sofficerc)."
--55 = "Das %PRODUCTNAME Scheduleserver %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm hat eine bestehende Installation erkannt.\n\nHaben Sie eine alte Installation eventuell nicht ?er das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm deinstalliert? Dann l?chen Sie bitte jetzt Ihr altes %PRODUCTNAME Scheduleserver-Verzeichnis (Ihre eventuell dort enthaltenen Dokumente brauchen Sie nicht zu l?chen). Dann l?chen Sie - je nach Betriebssystem - die Datei Sversion.ini im Windows oder OS2 Verzeichnis oder .sversionrc oder sversion.prefs. Versuchen Sie nun neu, das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm zu starten."
--37 = "L'aplicació ja està instal·lada al sistema (s'ha trobat un fitxer sversion.ini o sofficerc amb una entrada que concideix)."
--03 = "A aplicação jå se encontra instalada no seu sistema operativo (foi encontrado um ficheiro sversion.ini ou sofficerc com o respectivo registo)."
--30 = "ĂĂŽĂŻ ĂłĂœĂłĂŽĂ§ĂŹĂ ĂłĂĄĂČ Ă”Ă°Ăñ÷Äé ĂÀç ĂŹĂ©ĂĄ ĂĂȘÀïóç ÎçĂČ Ă„Ă¶ĂĄĂ±ĂŹĂŻĂŁĂĂČ (ùñĂÚçĂȘĂ„ ĂŽĂŻ åñ÷ÄĂĂŻ sversion.ini Ă sofficerc ĂŹĂ„ Îçà åĂĂŽĂóÎïé÷ç ÄããñåöĂ)."
--31 = "Het programma is reeds in uw systeem geĂŻnstalleerd (er werd een bestand gevonden met de naam sversion.ini resp. sofficerc met een dergelijk item)."
--33 = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier sversion.ini ou sofficerc a été détectée)."
--34 = "La aplicaciĂłn ya estĂĄ instalada en su sistema (se ha encontrado un archivo sversion.ini o sofficerc con la respectiva entrada)."
--35 = "Sovellus on jo asennettu jÀrjestelmÀÀn (asennusohjelma löysi sversion.ini- tai sofficerc-tiedoston, jossa on asennettavaa ohjelmaa vastaavat merkinnÀt)."
--39 = "L'applicazione Ăš giĂ installata nel vostro sistema (Ăš stato trovato un file sversion.ini o officerc contenete l'indicazione corrispondente)."
--45 = "Der findes allerede en version af %PRODUCTNAME %PRODUCTVERSION pÄ dit system (filen sversion.ini hhv. sofficerc er blevet fundet med et tilsvarende element).\n\nDu kan opdatere den eksisterende installation med dette program.\n\nInstallationsprogrammet (Setup) overskriver i givet fald nogle filer i dit %PRODUCTNAME installationsbibliotek med nye filer."
--46 = "TillÀmpningen Àr redan installerad i ditt system (en sversion.ini-fil resp. sofficerc-fil med motsvarande post har hittats)."
--48 = "Aplikacja ta jest juÂż zainstalowana w systemie komputera uÂżytkownika (poniewaÂż znaleziono informujÂčcy o tym plik sversion.ini lub sofficerc z odpowiednim wpisem)."
--81 = "ăäœżăăźă·ăčăă ă«ăŻăăă°ă©ă ăăă§ă«ă€ăłăčăăŒă«ăăăŠăăŸăăăăăăźé
çźăć«ă sversion.ini ăăĄă€ă«ăăăă㯠sofficerc ăăĄă€ă«ăèŠă€ăăăŸăăă"
--82 = "ìì© íëĄê·žëšìŽ ìŽëŻž ìì€í
ì ì€ìčëìŽ ìì”ëë€(íŽëč íëȘ©ìŽ ë€ìŽ ìë sversion.ini ëë sofficerc íìŒì ì°Ÿìì)"
--86 = "ćšæšççł»ç»äžć·Čç»ććšäžäžȘçšćșçæŹ(ć äžșæŸć°äžäžȘsversion.ini æè
sofficerc æ件æĄçź)ă"
--88 = "ćšçł»ç”±ć
§ć·Čç¶ććšäžćçšćŒçæŹ(ćšæȘæĄ sversion.ini æ sofficerc ć
§èšéçžæççŸćççæŹçćźèŁè·ŻćŸ)ă\n\næšèœć€ æŽæ°çŸæççæŹă"
--90 = "Sisteminizde bir %PRODUCTNAME %PRODUCTVERSION sĂŒrĂŒmĂŒ mevcut durumda (sversion.ini ya da sofficerc dosyasĂœ bulundu).\n\nMevcut kurulumu ĂŸimdi kuracaĂ°ĂœnĂœz sĂŒrĂŒmle gĂŒncelleyebilirsiniz.\n\nBu kurulum programĂœ, %PRODUCTNAME kurulum dizinindeki bazĂœ dosyalarĂœnĂœ yeni dosyalarla deĂ°iĂŸtirecektir."
--96 = "Ă„ĂĂ ĂĂĄĂĂĂĂĂ ĂŁĂĂĂ ĂĂĂĄĂĂĂĄ ĂĂĄĂŹ Ă€ĂĂĂŁ ĂĂĄĂĂĂĂĂĄ ĂĂĄĂĂĂ ĂĂ (ĂĂĂ ĂĂŁ ĂĂĄĂĂĂŠĂ ĂĂĄĂŹ ĂŁĂĄĂ sversion.ini ĂĂŠ sofficerc ĂĂ„ Ă
ĂĂĂĂĄ ĂĂĂĂ ĂĂĄĂ)."
-+01 = "The application is already installed on your system (a OOoversion.ini or an sofficerc file with a matching entry has been found)."
-+49 = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden)."
-+07 = "ĂĂČĂź ïðÚëßÊÄĂÚÄ óÊÄ ñóĂčÄñĂČùóÄĂČ Ăą Ăà ÞÄé ßïÄðà öÚßĂĂßé ñÚñĂČĂ„ĂŹĂ„ (ßåĂà ðóÊÄà Îà éë OOoversion.ini ÚëÚ sofficerc)."
-+55 = "Das %PRODUCTNAME Scheduleserver %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm hat eine bestehende Installation erkannt.\n\nHaben Sie eine alte Installation eventuell nicht ?er das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm deinstalliert? Dann l?chen Sie bitte jetzt Ihr altes %PRODUCTNAME Scheduleserver-Verzeichnis (Ihre eventuell dort enthaltenen Dokumente brauchen Sie nicht zu l?chen). Dann l?chen Sie - je nach Betriebssystem - die Datei Sversion.ini im Windows oder OS2 Verzeichnis oder .OOoversionrc oder sversion.prefs. Versuchen Sie nun neu, das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm zu starten."
-+37 = "L'aplicació ja està instal·lada al sistema (s'ha trobat un fitxer OOoversion.ini o sofficerc amb una entrada que concideix)."
-+03 = "A aplicação jå se encontra instalada no seu sistema operativo (foi encontrado um ficheiro OOoversion.ini ou sofficerc com o respectivo registo)."
-+30 = "ĂĂŽĂŻ ĂłĂœĂłĂŽĂ§ĂŹĂ ĂłĂĄĂČ Ă”Ă°Ăñ÷Äé ĂÀç ĂŹĂ©ĂĄ ĂĂȘÀïóç ÎçĂČ Ă„Ă¶ĂĄĂ±ĂŹĂŻĂŁĂĂČ (ùñĂÚçĂȘĂ„ ĂŽĂŻ åñ÷ÄĂĂŻ OOoversion.ini Ă sofficerc ĂŹĂ„ Îçà åĂĂŽĂóÎïé÷ç ÄããñåöĂ)."
-+31 = "Het programma is reeds in uw systeem geĂŻnstalleerd (er werd een bestand gevonden met de naam OOoversion.ini resp. sofficerc met een dergelijk item)."
-+33 = "L'application est déjà installée dans votre systÚme (une entrée présente dans le fichier OOoversion.ini ou sofficerc a été détectée)."
-+34 = "La aplicaciĂłn ya estĂĄ instalada en su sistema (se ha encontrado un archivo OOoversion.ini o sofficerc con la respectiva entrada)."
-+35 = "Sovellus on jo asennettu jÀrjestelmÀÀn (asennusohjelma löysi OOoversion.ini- tai sofficerc-tiedoston, jossa on asennettavaa ohjelmaa vastaavat merkinnÀt)."
-+39 = "L'applicazione Ăš giĂ installata nel vostro sistema (Ăš stato trovato un file OOoversion.ini o officerc contenete l'indicazione corrispondente)."
-+45 = "Der findes allerede en version af %PRODUCTNAME %PRODUCTVERSION pÄ dit system (filen OOoversion.ini hhv. sofficerc er blevet fundet med et tilsvarende element).\n\nDu kan opdatere den eksisterende installation med dette program.\n\nInstallationsprogrammet (Setup) overskriver i givet fald nogle filer i dit %PRODUCTNAME installationsbibliotek med nye filer."
-+46 = "TillÀmpningen Àr redan installerad i ditt system (en OOoversion.ini-fil resp. sofficerc-fil med motsvarande post har hittats)."
-+48 = "Aplikacja ta jest juÂż zainstalowana w systemie komputera uÂżytkownika (poniewaÂż znaleziono informujÂčcy o tym plik OOoversion.ini lub sofficerc z odpowiednim wpisem)."
-+81 = "ăäœżăăźă·ăčăă ă«ăŻăăă°ă©ă ăăă§ă«ă€ăłăčăăŒă«ăăăŠăăŸăăăăăăźé
çźăć«ă OOoversion.ini ăăĄă€ă«ăăăă㯠sofficerc ăăĄă€ă«ăèŠă€ăăăŸăăă"
-+82 = "ìì© íëĄê·žëšìŽ ìŽëŻž ìì€í
ì ì€ìčëìŽ ìì”ëë€(íŽëč íëȘ©ìŽ ë€ìŽ ìë OOoversion.ini ëë sofficerc íìŒì ì°Ÿìì)"
-+86 = "ćšæšççł»ç»äžć·Čç»ććšäžäžȘçšćșçæŹ(ć äžșæŸć°äžäžȘOOoversion.ini æè
sofficerc æ件æĄçź)ă"
-+88 = "ćšçł»ç”±ć
§ć·Čç¶ććšäžćçšćŒçæŹ(ćšæȘæĄ OOoversion.ini æ sofficerc ć
§èšéçžæççŸćççæŹçćźèŁè·ŻćŸ)ă\n\næšèœć€ æŽæ°çŸæççæŹă"
-+90 = "Sisteminizde bir %PRODUCTNAME %PRODUCTVERSION sĂŒrĂŒmĂŒ mevcut durumda (OOoversion.ini ya da sofficerc dosyasĂœ bulundu).\n\nMevcut kurulumu ĂŸimdi kuracaĂ°ĂœnĂœz sĂŒrĂŒmle gĂŒncelleyebilirsiniz.\n\nBu kurulum programĂœ, %PRODUCTNAME kurulum dizinindeki bazĂœ dosyalarĂœnĂœ yeni dosyalarla deĂ°iĂŸtirecektir."
-+96 = "Ă„ĂĂ ĂĂĄĂĂĂĂĂ ĂŁĂĂĂ ĂĂĂĄĂĂĂĄ ĂĂĄĂŹ Ă€ĂĂĂŁ ĂĂĄĂĂĂĂĂĄ ĂĂĄĂĂĂ ĂĂ (ĂĂĂ ĂĂŁ ĂĂĄĂĂĂŠĂ ĂĂĄĂŹ ĂŁĂĄĂ OOoversion.ini ĂĂŠ sofficerc ĂĂ„ Ă
ĂĂĂĂĄ ĂĂĂĂ ĂĂĄĂ)."
-
- [STR_HELP_MIGRATION]
- 01 = "%PRODUCTNAME can adopt personal data and configuration settings from a previous %PRODUCTNAME installation. To take advantage of this, activate the 'Import personal data' field. The path to the directory in the previous installation appears. If you do not want to accept data and settings from a previous version, unmark the 'Import personal data' check box."
---- oo_1.0.1_src/scp/source/player/player.scp.so-ooo-coexist 2001-11-12 19:47:25.000000000 +0100
-+++ oo_1.0.1_src/scp/source/player/player.scp 2002-08-22 21:54:44.000000000 +0200
-@@ -751,9 +751,9 @@ ProfileItem GID_PROFILEITEM_BOOTSTRAP_LO
- Order = 2;
- Key = "Location";
- #ifdef WNT
-- Value = "$SYSUSERCONFIG/sversion.ini";
-+ Value = "$SYSUSERCONFIG/OOoversion.ini";
- #else
-- Value = "$SYSUSERCONFIG/.sversionrc";
-+ Value = "$SYSUSERCONFIG/.OOoversionrc";
- #endif
- End
-
-@@ -1537,9 +1537,9 @@ End
- Profile GID_PROFILE_SVERSION
- ModuleID = GID_MODULE_ROOT;
- #ifdef UNX
-- Name = ".sversionrc";
-+ Name = ".OOoversionrc";
- #else
-- Name = "sversion.ini";
-+ Name = "OOoversion.ini";
- #endif
- // Name = PROFILENAME(sversion);
- Dir = PREDEFINED_CONFIGDIR;
---- oo_1.0.1_src/sal/osl/unx/profile.c.so-ooo-coexist 2001-11-21 15:29:50.000000000 +0100
-+++ oo_1.0.1_src/sal/osl/unx/profile.c 2002-08-22 21:54:45.000000000 +0200
-@@ -96,7 +96,7 @@
-
- #define SVERSION_LOCATION STR_INI_METACFG
- #define SVERSION_FALLBACK STR_INI_METASYS
--#define SVERSION_NAME "sversion"
-+#define SVERSION_NAME "OOoversion"
- #define SVERSION_SECTION "Versions"
- #define SVERSION_SOFFICE "StarOffice"
- #define SVERSION_PROFILE "sofficerc"
---- oo_1.0.1_src/tools/source/generic/config.cxx.so-ooo-coexist 2001-06-13 17:32:25.000000000 +0200
-+++ oo_1.0.1_src/tools/source/generic/config.cxx 2002-08-22 21:54:45.000000000 +0200
-@@ -239,9 +239,9 @@ static String ImplMakeConfigName( const
- else
- {
- #ifdef UNX
-- aFileName = ::rtl::OUString::createFromAscii( ".sversionrc" );
-+ aFileName = ::rtl::OUString::createFromAscii( ".OOoversionrc" );
- #else
-- aFileName = ::rtl::OUString::createFromAscii( "sversion.ini" );
-+ aFileName = ::rtl::OUString::createFromAscii( "OOoversion.ini" );
- #endif
- }
-
---- oo_1.0.1_src/unotools/inc/unotools/regpathhelper.hxx.so-ooo-coexist 2000-09-18 19:03:53.000000000 +0200
-+++ oo_1.0.1_src/unotools/inc/unotools/regpathhelper.hxx 2002-08-22 21:54:45.000000000 +0200
-@@ -73,7 +73,7 @@ namespace utl
- * This function returns a path to the user registry file.
- * Search for the user registry using the following rules:
- * <dl>
-- * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
-+ * <dt> 1. (for further use) search in OOoversion.ini (.OOoversionrc) for an entry
- * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
- * [Registry]. If found, then take this value instead of the name "user.rdb".
- * <dt> 2. Search in the config directory of the user for a file "user.rdb". If
---- oo_1.0.1_src/comphelper/inc/comphelper/regpathhelper.hxx.so-ooo-coexist 2000-09-29 13:28:15.000000000 +0200
-+++ oo_1.0.1_src/comphelper/inc/comphelper/regpathhelper.hxx 2002-08-22 21:54:45.000000000 +0200
-@@ -73,7 +73,7 @@ namespace comphelper
- * This function returns a path to the user registry file.
- * Search for the user registry using the following rules:
- * <dl>
-- * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
-+ * <dt> 1. (for further use) search in OOoversion.ini (.OOoversionrc) for an entry
- * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
- * [Registry]. If found, then take this value instead of the name "user.rdb".
- * <dt> 2. Search in the config directory of the user for a file "user.rdb". If
---- oo_1.0.1_src/comphelper/source/misc/regpathhelper.cxx.so-ooo-coexist 2001-07-23 12:14:42.000000000 +0200
-+++ oo_1.0.1_src/comphelper/source/misc/regpathhelper.cxx 2002-08-22 21:54:45.000000000 +0200
-@@ -93,7 +93,7 @@ using namespace rtl;
- #define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY"
- #define REGISTRY_SYSTEM_NAME "applicat.rdb"
-
--#define REGISTRY_LOCAL_NAME "user60.rdb"
-+#define REGISTRY_LOCAL_NAME "userOOo10.rdb"
-
- #ifdef SAL_UNX
- #define CONFIG_PATH_PREFIX "."
---- oo_1.0.1_src/udkapi/com/sun/star/registry/DefaultRegistry.idl.so-ooo-coexist 2001-11-16 16:05:59.000000000 +0100
-+++ oo_1.0.1_src/udkapi/com/sun/star/registry/DefaultRegistry.idl 2002-08-22 21:54:45.000000000 +0200
-@@ -158,7 +158,7 @@
- </dt>
- <dd>
- <dl>
-- <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
-+ <dt> 1. (for further use) search in OOoversion.ini (.OOoversionrc) for an entry
- REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
- [Registry]. If found, then take this value instead of "user.rdb" as "REGISTRY NAME".
- </dt>
---- oo_1.0.1_src/padmin/source/adddlg.cxx.so-ooo-coexist 2001-12-19 16:36:55.000000000 +0100
-+++ oo_1.0.1_src/padmin/source/adddlg.cxx 2002-08-22 21:54:45.000000000 +0200
-@@ -1077,7 +1077,7 @@ String AddPrinterDialog::getOldPrinterLo
- if( access( aFileName.GetBuffer(), F_OK ) )
- {
- aFileName = pHome;
-- aFileName.Append( "/.sversionrc" );
-+ aFileName.Append( "/.OOoversionrc" );
- Config aSVer( String( aFileName, aEncoding ) );
- aSVer.SetGroup( "Versions" );
- aFileName = aSVer.ReadKey( "StarOffice 5.2" );
+++ /dev/null
---- oo_1.0.1_src/sal/osl/unx/signal.c.segv 2003-01-14 03:59:12.000000000 -0500
-+++ oo_1.0.1_src/sal/osl/unx/signal.c 2003-01-14 04:47:54.000000000 -0500
-@@ -162,7 +162,8 @@ static sal_Bool InitSignal()
-
- char ProgFile[512];
-
-- if( (NULL != osl_impl_getExecutableName(ProgFile, sizeof(ProgFile))) &&
-+ if( 0 &&
-+ (NULL != osl_impl_getExecutableName(ProgFile, sizeof(ProgFile))) &&
- (NULL != strstr(ProgFile, "soffice")) )
- {
- char CmdLine[512];
+++ /dev/null
---- scp/prj/build.lst.orig 2003-07-15 14:35:49.000000000 +0000
-+++ scp/prj/build.lst 2003-12-16 13:48:20.000000000 +0000
-@@ -17,5 +17,4 @@
- cp scp\source\kde nmake - u cp_kde NULL
- cp scp\source\gnome nmake - u cp_gnome NULL
- cp scp\source\lingu nmake - all cp_lingu NULL
--cp scp\source\python nmake - all cp_python NULL
--cp scp\util nmake - all cp_util cp_crashrep cp_calc cp_chart cp_draw cp_fonts cp_gbl cp_grffilt cp_impress cp_javafilter cp_math cp_off cp_office_root cp_lingu cp_cde.u cp_kde.u cp_gnome.u cp_python NULL
-+cp scp\util nmake - all cp_util cp_crashrep cp_calc cp_chart cp_draw cp_fonts cp_gbl cp_grffilt cp_impress cp_javafilter cp_math cp_off cp_office_root cp_lingu cp_cde.u cp_kde.u cp_gnome.u NULL
---- scp/util/makefile.mk.orig 2003-12-16 13:45:31.000000000 +0000
-+++ scp/util/makefile.mk 2003-12-16 13:51:41.000000000 +0000
-@@ -109,8 +109,7 @@
- files_chart.par \
- files_grafik.par \
- files_lingu.par \
-- dir.par \
-- python.par
-+ dir.par
- .IF "$(SOLAR_JAVA)"!=""
- SCP1FILES += module_javafilter.par \
- profile_javafilter.par \
-@@ -119,8 +118,6 @@
- udk_pure_java.par
- .ENDIF
-
--#python.par
--
- .IF "$(GUI)"=="UNX"
- SCP1FILES += \
- dir_psprint.par \
-@@ -134,8 +131,7 @@
- files_cde.par \
- unxbasic_kde.par \
- unxbasic_gnome.par \
-- unxbasic_cde.par \
-- unxbasic_python.par
-+ unxbasic_cde.par
- .ELSE
- SCP1FILES += \
- basic.par
-@@ -148,9 +144,7 @@
- system_impress.par \
- system_draw.par \
- system_math.par \
-- system_chart.par \
-- winbasic_python.par
--
-+ system_chart.par
- .ENDIF
-
- .IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
+++ /dev/null
---- scp/prj/build.lst.orig 2003-07-15 14:35:49.000000000 +0000
-+++ scp/prj/build.lst 2003-12-16 13:48:20.000000000 +0000
-@@ -17,5 +17,4 @@
- cp scp\source\kde nmake - u cp_kde NULL
- cp scp\source\gnome nmake - u cp_gnome NULL
- cp scp\source\lingu nmake - all cp_lingu NULL
--cp scp\source\python nmake - all cp_python NULL
--cp scp\util nmake - all cp_util cp_crashrep cp_calc cp_chart cp_draw cp_fonts cp_gbl cp_grffilt cp_impress cp_javafilter cp_math cp_off cp_office_root cp_lingu cp_cde.u cp_kde.u cp_gnome.u cp_python NULL
-+cp scp\util nmake - all cp_util cp_crashrep cp_calc cp_chart cp_draw cp_fonts cp_gbl cp_grffilt cp_impress cp_javafilter cp_math cp_off cp_office_root cp_lingu cp_cde.u cp_kde.u cp_gnome.u NULL
---- scp/util/makefile.mk.orig 2003-08-21 11:46:53.000000000 +0200
-+++ scp/util/makefile.mk 2004-01-15 14:04:18.719375584 +0100
-@@ -114,12 +114,9 @@
- files_grafik.par \
- files_lingu.par \
- files_javafilter.par \
-- dir.par \
-- python.par
-+ dir.par
-
-
--#python.par
--
- .IF "$(GUI)"=="UNX"
- SCP1FILES += \
- dir_psprint.par \
-@@ -133,8 +130,7 @@
- files_cde.par \
- unxbasic_kde.par \
- unxbasic_gnome.par \
-- unxbasic_cde.par \
-- unxbasic_python.par
-+ unxbasic_cde.par
- .ELSE
- SCP1FILES += \
- basic.par
-@@ -147,9 +143,7 @@
- system_impress.par \
- system_draw.par \
- system_math.par \
-- system_chart.par \
-- winbasic_python.par
--
-+ system_chart.par
- .ENDIF
-
- .IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
+++ /dev/null
---- oo_1.1rc3_src/psprint/source/helper/ppdparser.cxx.psprint-cups-PPD 2003-04-15 12:14:50.000000000 -0400
-+++ oo_1.1rc3_src/psprint/source/helper/ppdparser.cxx 2003-08-25 07:27:23.000000000 -0400
-@@ -61,6 +61,9 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+#ifndef __SGI_STL_MAP
-+#include <map>
-+#endif
- #ifndef __SGI_STL_HASH_MAP
- #include <hash_map>
- #endif
-@@ -83,6 +86,9 @@ struct std::hash< const psp::PPDKey* >
- #include <osl/file.hxx>
- #include <osl/process.h>
- #include <osl/thread.h>
-+#include <tools/fsys.hxx>
-+#include <rtl/bootstrap.hxx>
-+#include <cups/cups.h>
-
- #define PRINTER_PPDDIR "driver"
-
-@@ -173,6 +179,52 @@ void PPDParser::initPPDFiles()
- }
- }
-
-+static String GetPPDFileFromCUPS ( const String& rPrinter )
-+{
-+ String aPPDFile;
-+ const char *pPPDFile;
-+
-+ // Try to get the PPD file from a CUPS server
-+ pPPDFile = cupsGetPPD( OString( rPrinter.GetBuffer(),
-+ rPrinter.Len(),
-+ RTL_TEXTENCODING_UTF8 ).getStr() );
-+
-+ // If found, cache it immediately to the user psprint/drivers directory
-+ if ( pPPDFile )
-+ {
-+ // Get user psprint directory name
-+ static OUString aUserPath;
-+ static bOnce = false;
-+
-+ if ( ! bOnce )
-+ {
-+ bOnce = true;
-+ OUString aIni;
-+ osl_getExecutableFile( &aIni.pData );
-+ aIni = aIni.copy( 0, aIni.lastIndexOf( SAL_PATHDELIMITER )+1 );
-+ aIni += OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "bootstrap" ) ) );
-+ Bootstrap aBootstrap( aIni );
-+ aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath );
-+
-+ if( ! aUserPath.compareToAscii( "file://", 7 ) )
-+ aUserPath = aUserPath.copy( 7 );
-+
-+ // The directory is bound to exist since it is created at installation time
-+ aUserPath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/psprint/" PRINTER_PPDDIR "/" ) );
-+ }
-+
-+ // Copy and remove temporary PPD file
-+ DirEntry aSrcPath( String::CreateFromAscii( pPPDFile ) );
-+ DirEntry aDstPath( aUserPath + rPrinter + String::CreateFromAscii( ".PPD" ) );
-+ aSrcPath.CopyTo( aDstPath, FSYS_ACTION_COPYFILE );
-+ remove( pPPDFile );
-+
-+ aPPDFile = aDstPath.GetFull();
-+ }
-+
-+ return aPPDFile;
-+}
-+
- String PPDParser::getPPDFile( const String& rFile )
- {
- INetURLObject aPPD( rFile, INET_PROT_FILE, INetURLObject::ENCODE_ALL );
-@@ -195,6 +247,17 @@ String PPDParser::getPPDFile( const Stri
- if( it != pAllPPDFiles->end() )
- aStream.Open( it->second, STREAM_READ );
- }
-+ if ( ! aStream.IsOpen() )
-+ {
-+ // Try to get the PPD file from a CUPS server
-+ String aFile( GetPPDFileFromCUPS( rFile ) );
-+
-+ if ( aFile.Len() )
-+ {
-+ aPPD = INetURLObject( aFile, INET_PROT_FILE, INetURLObject::ENCODE_ALL );
-+ aStream.Open( aPPD.PathToFileName(), STREAM_READ );
-+ }
-+ }
-
- String aRet;
- if( aStream.IsOpen() )
---- oo_1.1rc3_src/psprint/source/printer/printerinfomanager.cxx.psprint-cups-PPD 2003-08-25 07:29:03.000000000 -0400
-+++ oo_1.1rc3_src/psprint/source/printer/printerinfomanager.cxx 2003-08-25 07:24:49.000000000 -0400
-@@ -536,6 +536,37 @@ void PrinterInfoManager::initialize()
- aPrinter.m_bModified = false;
- aPrinter.m_aGroup = ByteString( aPrinterName, aEncoding ); //provide group name in case user makes this one permanent in padmin
-
-+ const PPDParser* pParser = PPDParser::getParser( *it );
-+ if ( pParser )
-+ {
-+ aPrinter.m_bModified = true;
-+ aPrinter.m_aInfo.m_aDriverName = *it;
-+ aPrinter.m_aInfo.m_pParser = pParser;
-+ aPrinter.m_aInfo.m_aContext.setParser( pParser );
-+
-+ fillFontSubstitutions( aPrinter.m_aInfo );
-+ // merge PPD values with merge defaults
-+ for( int nPPDValueModified = 0; nPPDValueModified < aMergeInfo.m_aContext.countValuesModified(); nPPDValueModified++ )
-+ {
-+ const PPDKey* pDefKey = aMergeInfo.m_aContext.getModifiedKey( nPPDValueModified );
-+ const PPDValue* pDefValue = aMergeInfo.m_aContext.getValue( pDefKey );
-+ const PPDKey* pPrinterKey = pDefKey ? aPrinter.m_aInfo.m_pParser->getKey( pDefKey->getKey() ) : NULL;
-+ if( pDefKey && pPrinterKey )
-+ // at least the options exist in both PPDs
-+ {
-+ if( pDefValue )
-+ {
-+ const PPDValue* pPrinterValue = pPrinterKey->getValue( pDefValue->m_aOption );
-+ if( pPrinterValue )
-+ // the printer has a corresponding option for the key
-+ aPrinter.m_aInfo.m_aContext.setValue( pPrinterKey, pPrinterValue );
-+ }
-+ else
-+ aPrinter.m_aInfo.m_aContext.setValue( pPrinterKey, NULL );
-+ }
-+ }
-+ }
-+
- m_aPrinters[ aPrinterName ] = aPrinter;
- }
- }
---- oo_1.1rc3_src/psprint/util/makefile.mk.orig 2004-03-30 02:07:00.000000000 +0000
-+++ oo_1.1rc3_src/psprint/util/makefile.mk 2004-03-30 02:07:14.000000000 +0000
-@@ -103,7 +103,7 @@
- SHL1STDLIBS=$(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(SALLIB) \
-- -lX11
-+ -lX11 -lcups
- .IF "$(SOLAR_JAVA)"!=""
- SHL1STDLIBS+=$(JVMACCESSLIB)
- .ENDIF
+++ /dev/null
---- oo_1.1rc4_src/psprint_config/configuration/letter/psprint.conf.psprint-pdf-drivers 2002-12-10 06:59:31.000000000 -0500
-+++ oo_1.1rc4_src/psprint_config/configuration/letter/psprint.conf 2003-09-11 13:12:02.000000000 -0400
-@@ -96,3 +96,83 @@ SubstFont_Times New Roman=Times
- SubstFont_Thorndale=Times
- SubstFont_Timmons=Times
- SubstFont_Cumberland=Courier
-+
-+; [gghibo] Entries to enable a PDF writer with PDF 1.4 output and
-+; bitmap not downsampled (useful for press).
-+[PDF 1.4 Converter Screen]
-+Printer=ADISTILL/PDF 1.4 Converter Screen
-+DefaultPrinter=0
-+Location=
-+Comment=
-+Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -sOutputFile="(OUTFILE)" -
-+Features=pdf=
-+Copies=1
-+Scale=0
-+Orientation=Portrait
-+PSLevel=0
-+ColorDevice=0
-+ColorDepth=24
-+MarginAdjust=0,0,0,0
-+PPD_PageSize=Letter
-+PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
-+
-+[PDF 1.4 Converter Press]
-+Printer=ADISTILL/PDF 1.4 Converter Press
-+DefaultPrinter=0
-+Location=
-+Comment=
-+Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -dAutoFilterColorImages=false -sColorImageFilter=FlateEncode -dAutoFilterGrayImages=false -sGrayImageFilter=FlateEncode -sOutputFile="(OUTFILE)" -
-+Features=pdf=
-+Copies=1
-+Scale=0
-+Orientation=Portrait
-+PSLevel=0
-+ColorDevice=0
-+ColorDepth=24
-+MarginAdjust=0,0,0,0
-+PPD_PageSize=Letter
-+PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
-+
-+; [gghibo] entries to produce distillable PostScript output
-+;
-+[Generic PostScript output (distillable)]
-+Printer=ADISTILL/Generic PostScript output (distillable)
-+DefaultPrinter=0
-+Location=
-+Comment=
-+Command=
-+Features=
-+Copies=1
-+Scale=1
-+Orientation=Portrait
-+PSLevel=0
-+ColorDevice=0
-+ColorDepth=24
-+MarginAdjust=0,0,0,0
-+PPD_PageSize=Letter
-+PPD_Resolution=600dpi
-+PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
---- oo_1.1rc4_src/psprint_config/configuration/psprint.conf.psprint-pdf-drivers 2002-02-28 11:05:08.000000000 -0500
-+++ oo_1.1rc4_src/psprint_config/configuration/psprint.conf 2003-09-09 17:39:45.000000000 -0400
-@@ -96,3 +96,83 @@ SubstFont_Times New Roman=Times
- SubstFont_Thorndale=Times
- SubstFont_Timmons=Times
- SubstFont_Cumberland=Courier
-+
-+; [gghibo] Entries to enable a PDF writer with PDF 1.4 output and
-+; bitmap not downsampled (useful for press).
-+[PDF 1.4 Converter Screen]
-+Printer=ADISTILL/PDF 1.4 Converter Screen
-+DefaultPrinter=0
-+Location=
-+Comment=
-+Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -sOutputFile="(OUTFILE)" -
-+Features=pdf=
-+Copies=1
-+Scale=0
-+Orientation=Portrait
-+PSLevel=0
-+ColorDevice=0
-+ColorDepth=24
-+MarginAdjust=0,0,0,0
-+PPD_PageSize=A4
-+PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
-+
-+[PDF 1.4 Converter Press]
-+Printer=ADISTILL/PDF 1.4 Converter Press
-+DefaultPrinter=0
-+Location=
-+Comment=
-+Command=/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -dAutoFilterColorImages=false -sColorImageFilter=FlateEncode -dAutoFilterGrayImages=false -sGrayImageFilter=FlateEncode -sOutputFile="(OUTFILE)" -
-+Features=pdf=
-+Copies=1
-+Scale=0
-+Orientation=Portrait
-+PSLevel=0
-+ColorDevice=0
-+ColorDepth=24
-+MarginAdjust=0,0,0,0
-+PPD_PageSize=A4
-+PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
-+
-+; [gghibo] entries to produce distillable PostScript output
-+;
-+[Generic PostScript output (distillable)]
-+Printer=ADISTILL/Generic PostScript output (distillable)
-+DefaultPrinter=0
-+Location=
-+Comment=
-+Command=
-+Features=
-+Copies=1
-+Scale=1
-+Orientation=Portrait
-+PSLevel=0
-+ColorDevice=0
-+ColorDepth=24
-+MarginAdjust=0,0,0,0
-+PPD_PageSize=A4
-+PPD_Resolution=600dpi
-+PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
+++ /dev/null
---- oo_1.1rc3_src/vcl/unx/source/app/salmain.cxx.sal-main-cmdline 2003-07-31 23:34:39.000000000 -0400
-+++ oo_1.1rc3_src/vcl/unx/source/app/salmain.cxx 2003-08-25 04:38:27.000000000 -0400
-@@ -93,6 +93,10 @@ int main( int argc, char *argv[] )
- setrlimit( RLIMIT_NOFILE, &aLimit );
- }
-
-+#ifdef LINUX
-+ extern void osl_setCommandArgs(sal_Char* aArgs[], sal_uInt32 nArgs);
-+ osl_setCommandArgs(argv, argc);
-+#endif
- SVMain();
-
- // #75628# avoid calling atexit and fini since this core-dumps if calling pgp-java
---- oo_1.1rc3_src/sal/inc/sal/main.h.sal-main-cmdline 2001-02-27 05:44:53.000000000 -0500
-+++ oo_1.1rc3_src/sal/inc/sal/main.h 2003-08-25 04:37:48.000000000 -0400
-@@ -118,8 +118,18 @@ int WINAPI WinMain( HINSTANCE _hinst, HI
- return sal_main(); \
- }
-
-+#elif defined(LINUX)
-
--#else /* ! SAL_W32 */
-+extern "C" void osl_setCommandArgs(sal_Char* aArgs[], sal_uInt32 nArgs);
-+
-+#define SAL_DEFINE_CRT_ENTRY() \
-+int main(int argc, char *argv[]) \
-+{ \
-+ osl_setCommandArgs(argv, argc); \
-+ return sal_main(); \
-+}
-+
-+#else /* ! SAL_W32 && ! LINUX */
-
- #define SAL_DEFINE_CRT_ENTRY() \
- int main() \
---- oo_1.1rc3_src/sal/osl/unx/process.c.sal-main-cmdline 2003-07-02 09:34:17.000000000 -0400
-+++ oo_1.1rc3_src/sal/osl/unx/process.c 2003-08-25 04:40:23.000000000 -0400
-@@ -308,12 +308,17 @@ sal_Char *getCmdLine()
- }
- #endif
-
--#ifdef CMD_ARG_PROC_STREAM
-+#if defined( CMD_ARG_PROC_STREAM ) || defined( CMD_ARG_FROM_MAIN )
- /*
- * mfe: this is for Linux
- * (and which other Unix flavours?)
- */
-+#ifdef CMD_ARG_PROC_STREAM
- sal_Char *getCmdLine()
-+#else
-+#define ALTERNATE_GETCMDLINE alternate_getCmdLine
-+static sal_Char *ALTERNATE_GETCMDLINE()
-+#endif
- {
- FILE *fp;
- sal_Char name[PATH_MAX + 1];
-@@ -450,6 +455,61 @@ sal_Char *getCmdLine()
- }
- #endif
-
-+#ifdef CMD_ARG_FROM_MAIN
-+/* Command line arguments copied from main() entry values. */
-+static sal_Char *aCommandArgs = NULL;
-+static sal_uInt32 nCommandSize = 0;
-+
-+sal_Char *getCmdLine()
-+{
-+ if (aCommandArgs)
-+ {
-+ sal_Char *pchr = (sal_Char *) malloc(nCommandSize);
-+ return pchr && memcpy(pchr, aCommandArgs, nCommandSize) ? pchr : NULL;
-+ }
-+#ifdef ALTERNATE_GETCMDLINE
-+ return ALTERNATE_GETCMDLINE();
-+#else
-+ return NULL;
-+#endif
-+}
-+
-+void osl_setCommandArgs(sal_Char* aArgs[], sal_uInt32 nArgs)
-+{
-+ sal_uInt32 nArg, nSize = 0;
-+
-+ for (nArg = 0; nArg < nArgs; nArg++)
-+ nSize += strlen(aArgs[nArg]) + 1;
-+
-+ // NOTE: a sal_Char is always 1 anyway
-+ nCommandSize = nSize + 1;
-+ aCommandArgs = (sal_Char *) calloc(nCommandSize, sizeof(sal_Char));
-+
-+ if (aCommandArgs)
-+ {
-+ sal_Char *pszArgs = aCommandArgs;
-+ for (nArg = 0; nArg < nArgs; nArg++)
-+ {
-+ nSize = strlen(aArgs[nArg]);
-+ memcpy(pszArgs, aArgs[nArg], nSize);
-+ pszArgs += nSize + 1; // skip '\0';
-+ }
-+#if 0
-+ {
-+ pszArgs = aCommandArgs;
-+ fprintf(stderr, "osl_setCommandArgs, %d args\n", nArgs);
-+ for (nArg = 0; nArg < nArgs; nArg++)
-+ {
-+ fprintf(stderr, "%u: '%s'\n", nArg, pszArgs);
-+ pszArgs += strlen(pszArgs) + 1;
-+ }
-+ }
-+#endif
-+ }
-+}
-+#endif
-+
-+
- /*******************************************************************
- !!! Working on byte strings is dangerous because of MBCS see
- #104563.
---- oo_1.1rc3_src/sal/osl/unx/system.h.sal-main-cmdline 2003-07-30 12:04:04.000000000 -0400
-+++ oo_1.1rc3_src/sal/osl/unx/system.h 2003-08-25 04:37:48.000000000 -0400
-@@ -135,8 +135,8 @@
- # define IOCHANNEL_TRANSFER_BSD_RENO
- # define pthread_testcancel()
- # define NO_PTHREAD_PRIORITY
--# define CMD_ARG_PROC_STREAM
- # define CMD_ARG_PROC_NAME "/proc/%u/cmdline"
-+# define CMD_ARG_FROM_MAIN
- # define PTHREAD_SIGACTION pthread_sigaction
- #else
- # include <shadow.h>
---- oo_1.1rc3_src/sal/util/sal.map.sal-main-cmdline 2003-04-04 05:46:19.000000000 -0500
-+++ oo_1.1rc3_src/sal/util/sal.map 2003-08-25 04:37:48.000000000 -0400
-@@ -51,6 +51,7 @@ UDK_3_0_0 {
- osl_freeProcessHandle;
- osl_freeSecurityHandle;
- osl_getAddrOfSocketAddr;
-+ osl_setCommandArgs;
- osl_getCommandArg;
- osl_getCommandArgCount;
- osl_getConfigDir;
+++ /dev/null
---- oo_1.0_src/config_office/configure.in~~ Thu May 2 16:48:20 2002
-+++ oo_1.0_src/config_office/configure.in Thu May 2 16:50:49 2002
-@@ -998,10 +998,10 @@
- CFLAGS=$X_CFLAGS
- LDFLAGS="$X_LDFLAGS $X_LIBS"
- AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
--else
-- x_includes="no_x_includes"
-- x_libraries="no_x_libraries"
--fi
-+dnl else
-+dnl x_includes="no_x_includes"
-+dnl x_libraries="no_x_libraries"
-+dnl fi
- dnl ***************************************
- dnl testing libc version for Linux...
- dnl ***************************************
+++ /dev/null
-DICT af ZA af_ZA
-DICT bg BG bg_BG
-DICT ca ES ca_ES
-DICT cs CZ cs_CZ
-DICT cy GB cy_GB
-DICT da DK da_DK
-DICT de AT de_AT
-DICT de CH de_CH
-DICT de DE de_DE_comb
-DICT de DE de_DE_neu
-DICT de DE de_DE
-DICT el GR el_GR
-DICT en AU en_AU
-DICT en CA en_CA
-DICT en EN en_EN
-DICT en GB en_GB
-DICT en NZ en_NZ
-DICT en US en_US
-DICT es ES es_ES
-DICT es MX es_MX
-DICT fi FI fi_FI
-DICT fo FO fo_FO
-DICT fr BE fr_BE
-DICT fr FR fr_FR
-DICT ga IE ga_IE
-DICT gl ES gl_ES
-DICT hr HR hr_HR
-DICT hu HU hu_HU
-DICT ia IA ia_IA
-DICT la LA la_LA
-DICT lt LT lt_LT
-DICT es ES Math_es_ES
-DICT mi NZ mi_NZ
-DICT ms NY ms_NY
-DICT nb NO nb_NO
-DICT nl NL nl_NL
-DICT nn NO nn_NO
-DICT no NO no_NO
-DICT pl PL pl_PL
-DICT pt BR pt_BR
-DICT pt PT pt_PT
-DICT ro RO ro_RO
-DICT ru RU ru_RU
-DICT sk SK sk_SK
-DICT sl SI sl_SI
-DICT sv SE sv_SE
-DICT uk UA uk_UA
-HYPH bg BG hyph_bg_BG
-HYPH cs CZ hyph_cs_CZ
-HYPH da DK hyph_da_DK
-HYPH de CH hyph_de_CH
-HYPH de DE hyph_de_DE
-HYPH el GR hyph_el_GR
-HYPH en AU hyph_en_AU
-HYPH en CA hyph_en_CA
-HYPH en GB hyph_en_GB
-HYPH en NZ hyph_en_NZ
-HYPH en US hyph_en_US
-HYPH es ES hyph_es_ES
-HYPH es MX hyph_es_MX
-HYPH fi FI hyph_fi_FI
-HYPH fr BE hyph_fr_BE
-HYPH fr FR hyph_fr_FR
-HYPH ga IE hyph_ga_IE
-HYPH hu HU hyph_hu_HU
-HYPH id ID hyph_id_ID
-HYPH is IS hyph_is_IS
-HYPH it IT hyph_it_IT
-HYPH lt LT hyph_lt_LT
-HYPH nl NL hyph_nl_NL
-HYPH pl PL hyph_pl_PL
-HYPH pt BR hyph_pt_BR
-HYPH pt PT hyph_pt_PT
-HYPH sk SK hyph_sk_SK
-HYPH sl SI hyph_sl
-HYPH sv SE hyph_sv_SE
-HYPH uk UA hyph_uk
-THES bg BG thes_bg_BG
-THES de DE thes_de_DE
-THES en US thes_en_US
-THES fr FR thes_fr_FR
-THES hu HU thes_hu_HU
+++ /dev/null
---- config_office/configure.in.orig 2003-09-22 11:14:29.000000000 -0700
-+++ config_office/configure.in 2003-09-22 11:33:19.000000000 -0700
-@@ -1124,66 +1124,79 @@
- dnl ===================================================================
- dnl Checks for JDK.
- dnl ===================================================================
--JAVA_HOME=; export JAVA_HOME
--if test -z "$with_jdk_home"; then
-- AC_PATH_PROG(JAVAC, javac)
-- AC_PATH_PROG(JAVA, java)
--else
-- _javac_path="$with_jdk_home/bin/javac"
-- dnl Check if there is a java compiler at all.
-- if test -x "$_javac_path"; then
-- JAVAC=$_javac_path
-- else
-- AC_MSG_ERROR([$_javac_path not found set with_jdk_home])
-+if test "$enable_java" != "no"; then
-+ JAVA_HOME=; export JAVA_HOME
-+ if test -z "$with_jdk_home"; then
-+ AC_PATH_PROG(JAVAC, javac)
-+ AC_PATH_PROG(JAVA, java)
-+ else
-+ _javac_path="$with_jdk_home/bin/javac"
-+ dnl Check if there is a java compiler at all.
-+ if test -x "$_javac_path"; then
-+ JAVAC=$_javac_path
-+ else
-+ AC_MSG_ERROR([$_javac_path not found set with_jdk_home])
-+ fi
-+
-+ _java_path="$with_jdk_home/bin/java"
-+ dnl Check if there is a java interpreter at all.
-+ if test -x "$_java_path"; then
-+ JAVA=$_java_path
-+ else
-+ AC_MSG_ERROR([$_java_path not found set with_jdk_home])
-+ fi
- fi
-+ AC_MSG_CHECKING([the installed JDK])
-+ if test "$JAVA"; then
-
-- _java_path="$with_jdk_home/bin/java"
-- dnl Check if there is a java interpreter at all.
-- if test -x "$_java_path"; then
-- JAVA=$_java_path
-- else
-- AC_MSG_ERROR([$_java_path not found set with_jdk_home])
-- fi
--fi
--AC_MSG_CHECKING([the installed JDK])
--if test "$JAVA"; then
--
-- dnl java -version sends output to stderr!
-- if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
--
-- dnl Kaffe specific tests
-- KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
-- if test -z "$KAFFE_VER"; then
-- AC_MSG_ERROR([looks like Kaffe but version detection failed])
-- fi
-- _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-- if test "$_kaffe_ver" -lt 10100; then
-- AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
-- fi
-- JDK=kaffe
--
-- dnl TODO: define some project exclusion variables
--
-- AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
-- AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
-- echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
-- else
--
-- dnl SUN JDK specific tests
-- _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-- _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
--
-- if test "$_jdk_ver" -lt 10300; then
-- AC_MSG_ERROR([JDK is too old, you need at least 1.3])
-- fi
-- AC_MSG_RESULT([checked (JDK $_jdk)])
-+ dnl java -version sends output to stderr!
-+ if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-+
-+ dnl Kaffe specific tests
-+ KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
-+ if test -z "$KAFFE_VER"; then
-+ AC_MSG_ERROR([looks like Kaffe but version detection failed])
-+ fi
-+ _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-+ if test "$_kaffe_ver" -lt 10100; then
-+ AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
-+ fi
-+ JDK=kaffe
-+
-+ dnl TODO: define some project exclusion variables
-+
-+ AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
-+ AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
-+ echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
-+ else
-+
-+ dnl SUN JDK specific tests
-+ _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
-+ _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
-+
-+ if test "$_jdk_ver" -lt 10300; then
-+ AC_MSG_ERROR([JDK is too old, you need at least 1.3])
-+ fi
-+ AC_MSG_RESULT([checked (JDK $_jdk)])
-+ fi
-+ JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
-+ else
-+ AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
- fi
-- JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
-+ dnl xsltproc not needed with JDK present.
-+ XSLTPROC=NO_XSLTPROC
- else
-- AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
-+ dnl Java disabled
-+ JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
-+ dnl Check for xsltproc
-+ AC_PATH_PROG(XSLTPROC, xsltproc, no)
-+ if test "$XSLTPROC" = "no"; then
-+ AC_MSG_ERROR([xsltproc is required when building with --disable-java.])
-+ fi
- fi
- AC_SUBST(JAVA_HOME)
- AC_SUBST(JDK)
-+AC_SUBST(XSLTPROC)
-
- dnl ===================================================================
- dnl Checks for specific files.
---- config_office/set_soenv.in.orig 2003-09-22 11:27:24.000000000 -0700
-+++ config_office/set_soenv.in 2003-09-22 11:30:33.000000000 -0700
-@@ -1359,6 +1359,7 @@
- if ( '@JDK@' ne '' )
- { ToFile( "JDK", "@JDK@", "e" );
- }
-+ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
- ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
- ToFile( "JDKLIB", $JAVA_LIB, "e" );
- ToFile( "STLPORT4", $STLPORT4, "e" );
+++ /dev/null
---- oo_1.0_src/sal/osl/unx/interlck.c.jj Wed May 2 17:03:13 2001
-+++ oo_1.0_src/sal/osl/unx/interlck.c Thu May 30 10:45:19 2002
-@@ -83,9 +83,11 @@ oslInterlockedCount SAL_CALL osl_increme
- "lock\n\t"
- "xadd %0, %2\n\t"
- "incl %0"
-- : "=a" (nCount), "=m" (*pCount)
-+ : "=&r" (nCount), "=m" (*pCount)
- : "m" (*pCount)
- : "memory");
-+
-+ return nCount;
- }
-
- oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-@@ -97,9 +99,11 @@ oslInterlockedCount SAL_CALL osl_decreme
- "lock\n\t"
- "xadd %0, %2\n\t"
- "decl %0"
-- : "=a" (nCount), "=m" (*pCount)
-+ : "=&r" (nCount), "=m" (*pCount)
- : "m" (*pCount)
- : "memory");
-+
-+ return nCount;
- }
-
- #elif defined ( GCC ) && defined ( POWERPC )
-@@ -117,7 +121,7 @@ oslInterlockedCount SAL_CALL osl_increme
- " addi %0,%0,1\n\t"
- " stwcx. %0,0,%2\n\t"
- " bne- 1b"
-- : "=r" (nCount), "=m" (*pCount)
-+ : "=&r" (nCount), "=m" (*pCount)
- : "r" (pCount)
- : "r4", "memory");
-
-@@ -134,7 +138,7 @@ oslInterlockedCount SAL_CALL osl_decreme
- " subi %0,%0,1\n\t"
- " stwcx. %0,0,%2\n\t"
- " bne- 1b"
-- : "=r" (nCount), "=m" (*pCount)
-+ : "=&r" (nCount), "=m" (*pCount)
- : "r" (pCount)
- : "r4", "memory");
-
---- oo_1.0_src/bridges/source/c_uno/intelx86.cxx.jj Wed Apr 18 13:05:48 2001
-+++ oo_1.0_src/bridges/source/c_uno/intelx86.cxx Thu May 30 11:37:26 2002
-@@ -95,24 +95,21 @@ Lcopy: sub eax, 4
- add esp, eax
- }
- #elif GCC
-+ int ecx, edx;
-+
- __asm__
- (
-- "mov %2, %%eax\n\t"
-- "mov %%eax, %%ecx\n\t"
-- "shl $2, %%eax\n\t"
-- "add %1, %%eax\n"
-- "Lcopy:\n\t"
-- "sub $4, %%eax\n\t"
-- "pushl (%%eax)\n\t"
-- "dec %%ecx\n\t"
-- "jne Lcopy\n\t"
-- "mov %0, %%eax\n\t"
-- "call *%%eax\n\t"
-- "mov %%eax, %3\n"
-- "mov %2, %%eax\n\t"
-- "shl $2, %%eax\n\t"
-- "add %%eax, %%esp\n\t"
-- : : "m"(fptr), "m"(pParams), "m"(nParams), "m"(retVal)
-+ "1:\n\t"
-+ "subl $4, %0\n\t"
-+ "pushl (%0)\n\t"
-+ "decl %1\n\t"
-+ "jne 1b\n\t"
-+ "call *%2\n\t"
-+ "leal 0(%%esp,%3,4), %%esp\n\t"
-+ : "=a"(retVal), "=c"(ecx), "=d"(edx)
-+ : "S"(nParams),
-+ "0" (((int *) pParams) + nParams), "1" (nParams), "2"(fptr)
-+ : "memory", "cc"
- );
- #else
- #error "### unsupported x86 compiler!"
+++ /dev/null
-diff -uNr ooold/autodoc/inc/ary_i/uidl/speci_ce.hxx oonew/autodoc/inc/ary_i/uidl/speci_ce.hxx
---- ooold/autodoc/inc/ary_i/uidl/speci_ce.hxx Fri Mar 8 15:45:16 2002
-+++ oonew/autodoc/inc/ary_i/uidl/speci_ce.hxx Fri Aug 2 12:54:25 2002
-@@ -65,6 +65,7 @@
-
- // USED SERVICES
- // BASE CLASSES
-+#include <ary_i/uidl/cenamesp.hxx>
- #include <ary_i/ce2.hxx>
- // COMPONENTS
- // PARAMETERS
-diff -uNr ooold/autodoc/prj/build.lst oonew/autodoc/prj/build.lst
---- ooold/autodoc/prj/build.lst Tue May 14 11:02:10 2002
-+++ oonew/autodoc/prj/build.lst Thu Aug 1 18:09:58 2002
-@@ -23,7 +23,7 @@
- ar autodoc\source\inc\display get - all ar_si_display NULL
- ar autodoc\source\inc\oodb get - all ar_si_oodb2 NULL
- ar autodoc\source\inc\tools get - all ar_si_tools NULL
--ar autodoc\source\inc\utility get - all ar_si_util2 NULL
-+#ar autodoc\source\inc\utility get - all ar_si_util2 NULL
- ar autodoc\source\ary get - all ar_sr NULL
- ar autodoc\source\ary\inc get - all ar_sri NULL
- ar autodoc\source\ary\inc\cpp get - all ar_sri_cpp NULL
-diff -uNr ooold/autodoc/source/displa_i/idoc/api_file.cxx oonew/autodoc/source/displa_i/idoc/api_file.cxx
---- ooold/autodoc/source/displa_i/idoc/api_file.cxx Thu May 2 14:36:16 2002
-+++ oonew/autodoc/source/displa_i/idoc/api_file.cxx Thu Aug 1 17:47:21 2002
-@@ -59,6 +59,7 @@
- *
- ************************************************************************/
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "api_file.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/dht_impl.cxx oonew/autodoc/source/displa_i/idoc/dht_impl.cxx
---- ooold/autodoc/source/displa_i/idoc/dht_impl.cxx Fri Mar 8 15:45:25 2002
-+++ oonew/autodoc/source/displa_i/idoc/dht_impl.cxx Thu Aug 1 17:52:51 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "dht_impl.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_compl.cxx oonew/autodoc/source/displa_i/idoc/di_compl.cxx
---- ooold/autodoc/source/displa_i/idoc/di_compl.cxx Fri Mar 8 15:45:25 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_compl.cxx Thu Aug 1 17:54:50 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_compl.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_docu.cxx oonew/autodoc/source/displa_i/idoc/di_docu.cxx
---- ooold/autodoc/source/displa_i/idoc/di_docu.cxx Fri Mar 8 15:45:25 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_docu.cxx Thu Aug 1 17:55:32 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_docu.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_glbix.cxx oonew/autodoc/source/displa_i/idoc/di_glbix.cxx
---- ooold/autodoc/source/displa_i/idoc/di_glbix.cxx Fri Mar 8 15:45:26 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_glbix.cxx Thu Aug 1 17:55:44 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_glbix.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_head.cxx oonew/autodoc/source/displa_i/idoc/di_head.cxx
---- ooold/autodoc/source/displa_i/idoc/di_head.cxx Thu May 2 14:36:16 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_head.cxx Thu Aug 1 17:56:03 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_head.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_linkg.cxx oonew/autodoc/source/displa_i/idoc/di_linkg.cxx
---- ooold/autodoc/source/displa_i/idoc/di_linkg.cxx Fri Mar 8 15:45:26 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_linkg.cxx Thu Aug 1 17:56:17 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_linkg.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_linkl.cxx oonew/autodoc/source/displa_i/idoc/di_linkl.cxx
---- ooold/autodoc/source/displa_i/idoc/di_linkl.cxx Fri Mar 8 15:45:26 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_linkl.cxx Thu Aug 1 17:59:20 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_linkl.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_summy.cxx oonew/autodoc/source/displa_i/idoc/di_summy.cxx
---- ooold/autodoc/source/displa_i/idoc/di_summy.cxx Fri Mar 8 15:45:26 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_summy.cxx Thu Aug 1 17:57:01 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_summy.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_syntx.cxx oonew/autodoc/source/displa_i/idoc/di_syntx.cxx
---- ooold/autodoc/source/displa_i/idoc/di_syntx.cxx Fri Mar 8 15:45:26 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_syntx.cxx Thu Aug 1 17:57:07 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_syntx.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/di_whole.cxx oonew/autodoc/source/displa_i/idoc/di_whole.cxx
---- ooold/autodoc/source/displa_i/idoc/di_whole.cxx Thu May 2 14:36:16 2002
-+++ oonew/autodoc/source/displa_i/idoc/di_whole.cxx Thu Aug 1 17:57:14 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "di_whole.hxx"
-
-diff -uNr ooold/autodoc/source/displa_i/idoc/didl_def.cxx oonew/autodoc/source/displa_i/idoc/didl_def.cxx
---- ooold/autodoc/source/displa_i/idoc/didl_def.cxx Fri Mar 8 15:45:25 2002
-+++ oonew/autodoc/source/displa_i/idoc/didl_def.cxx Thu Aug 1 17:57:20 2002
-@@ -59,6 +59,7 @@
- *
- ************************************************************************/
-
-+#include "/usr/include/stlport/utility"
- #include <precomp.h>
- #include "didl_def.hxx"
-
-diff -uNr ooold/autodoc/source/parser_i/idl/cx_idlco.cxx oonew/autodoc/source/parser_i/idl/cx_idlco.cxx
---- ooold/autodoc/source/parser_i/idl/cx_idlco.cxx Fri Mar 8 15:45:34 2002
-+++ oonew/autodoc/source/parser_i/idl/cx_idlco.cxx Fri Aug 2 12:15:29 2002
-@@ -60,6 +60,7 @@
- ************************************************************************/
-
- #include <precomp.h>
-+#include <s2_luidl/tk_ident.hxx>
- #include <s2_luidl/cx_idlco.hxx>
-
-
-@@ -68,7 +69,6 @@
- #include <s2_dsapi/cx_dsapi.hxx>
- #include <tools/tkpchars.hxx>
- #include <tokens/tkpstam2.hxx>
--#include <s2_luidl/tk_ident.hxx>
- #include <s2_luidl/tk_keyw.hxx>
- #include <s2_luidl/tk_punct.hxx>
- #include <s2_luidl/tokrecv.hxx>
-diff -uNr ooold/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx oonew/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx
---- ooold/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx Fri Mar 8 15:45:35 2002
-+++ oonew/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx Fri Aug 2 12:20:27 2002
-@@ -64,9 +64,10 @@
-
- // USED SERVICES
- // BASE CLASSES
--#include <tokens/tkpcont2.hxx>
-+#include <s2_luidl/tk_ident.hxx>
-+#include "../tokens/tkpcont2.hxx"
- // COMPONENTS
--#include <tokens/tkpstam2.hxx>
-+#include "../tokens/tkpstam2.hxx"
- // PARAMETERS
-
-
-diff -uNr ooold/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx oonew/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx
---- ooold/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx Fri Mar 8 15:45:35 2002
-+++ oonew/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx Fri Aug 2 12:01:43 2002
-@@ -64,7 +64,8 @@
-
- // USED SERVICES
- // BASE CLASSES
--#include <tokens/tkpcont2.hxx>
-+#include "cx_idlco.hxx"
-+#include "../tokens/tkpcont2.hxx"
- // COMPONENTS
- // PARAMETERS
-
-diff -uNr ooold/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx oonew/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx
---- ooold/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx Fri Mar 8 15:45:35 2002
-+++ oonew/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx Fri Aug 2 12:33:48 2002
-@@ -66,6 +66,7 @@
-
- // USED SERVICES
- // BASE CLASSES
-+#include <ary_i/codeinf2.hxx>
- #include <s2_luidl/tokproct.hxx>
- // COMPONENTS
- #include <s2_luidl/semnode.hxx>
+++ /dev/null
---- berkeleydb/makefile.mk.orig 2003-08-07 20:01:59.000000000 -0700
-+++ berkeleydb/makefile.mk 2003-08-07 20:04:49.000000000 -0700
-@@ -80,7 +80,10 @@
- CONFIGURE_DIR=out
- #relative to CONFIGURE_DIR
- CONFIGURE_ACTION=..$/dist$/configure
--CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
-+CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared
-+.IF "$(SOLAR_JAVA)"!=""
-+CONFIGURE_FLAGS+=--enable-java
-+.ENDIF
-
- BUILD_DIR=$(CONFIGURE_DIR)
- .IF "$(OS)"=="IRIX"
-@@ -92,7 +95,9 @@
-
- OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
-
-+.IF "$(SOLAR_JAVA)"!=""
- OUT2BIN=java$/classes$/db.jar
-+.ENDIF
-
- .ENDIF # "$(GUI)"=="UNX"
-
-@@ -129,7 +134,9 @@
- include$/db_185.h \
- include$/db_cxx.h
-
-+.IF "$(SOLAR_JAVA)"!=""
- OUT2CLASS=java$/classes$/db.jar
-+.ENDIF
-
- # --- Targets ------------------------------------------------------
-
+++ /dev/null
---- oo_1.1_src/berkeleydb/makefile.mk.orig 2003-11-27 13:32:16.000000000 +0100
-+++ oo_1.1_src/berkeleydb/makefile.mk 2003-11-27 17:08:40.000000000 +0100
-@@ -71,9 +71,11 @@
- @echo "Since you're running a real OS, we're assuming you have db..."
- +$(COPY) /usr$/lib$/libdb-4.2.so $(DLLDEST)
- +$(COPY) /usr$/lib$/libdb_cxx-4.2.so $(DLLDEST)
-+.IF "$(SOLAR_JAVA)"!=""
- +$(COPY) /usr$/lib$/libdb_java-4.2.so $(DLLDEST)
- +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
- .ENDIF
-+.ENDIF
-
- # --- Settings -----------------------------------------------------
-
+++ /dev/null
-Index: vcl/source/gdi/impbmp.cxx
-===================================================================
-RCS file: /cvs/oo/gsl/vcl/source/gdi/impbmp.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 impbmp.cxx
---- vcl/source/gdi/impbmp.cxx 2000/09/18 17:05:37 1.1.1.1
-+++ vcl/source/gdi/impbmp.cxx 2002/11/05 20:13:01
-@@ -177,7 +177,7 @@
- #endif
- nBitCount = mpSalBitmap->GetBitCount();
-
-- return( ( nBitCount <= 1 ) ? 1 : ( nBitCount <= 4 ) ? 4 : ( nBitCount <= 8 ) ? 8 : 24 );
-+ return( ( nBitCount <= 1 ) ? 1 : ( nBitCount <= 4 ) ? 4 : ( nBitCount <= 8 ) ? 8 : ( nBitCount <= 24 ) ? 24 : 32 );
- }
-
- // -----------------------------------------------------------------------
-Index: vcl/unx/source/gdi/salbmp.cxx
-===================================================================
-RCS file: /cvs/oo/gsl/vcl/unx/source/gdi/salbmp.cxx,v
-retrieving revision 1.8
-diff -u -r1.8 salbmp.cxx
---- vcl/unx/source/gdi/salbmp.cxx 2001/09/11 15:52:22 1.8
-+++ vcl/unx/source/gdi/salbmp.cxx 2002/11/05 20:13:05
-@@ -150,7 +150,7 @@
-
- BitmapBuffer* SalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal )
- {
-- DBG_ASSERT( nBitCount == 1 || nBitCount == 4 || nBitCount == 8 || nBitCount == 24, "Unsupported BitCount!" );
-+ DBG_ASSERT( nBitCount == 1 || nBitCount == 4 || nBitCount == 8 || nBitCount == 24 || nBitCount == 32, "Unsupported BitCount!" );
-
- BitmapBuffer* pDIB;
-
-@@ -169,9 +169,10 @@
- case( 1 ): pDIB->mnFormat |= BMP_FORMAT_1BIT_MSB_PAL; break;
- case( 4 ): pDIB->mnFormat |= BMP_FORMAT_4BIT_MSN_PAL; break;
- case( 8 ): pDIB->mnFormat |= BMP_FORMAT_8BIT_PAL; break;
-+ case( 24 ): pDIB->mnFormat |= BMP_FORMAT_24BIT_TC_BGR; break;
-
- default:
-- pDIB->mnFormat |= BMP_FORMAT_24BIT_TC_BGR;
-+ pDIB->mnFormat |= BMP_FORMAT_32BIT_TC_BGRA;
- break;
- }
-
-@@ -802,8 +803,10 @@
- nBitCount = 4;
- else if( nBitCount <= 8 )
- nBitCount = 8;
-- else
-+ else if ( nBitCount <= 24)
- nBitCount = 24;
-+ else
-+ nBitCount = 32;
- }
- }
- else
-Index: svtools/bmpmaker/bmpcore.cxx
-===================================================================
-RCS file: /cvs/util/svtools/bmpmaker/bmpcore.cxx,v
-retrieving revision 1.12
-diff -u -p -u -r1.12 bmpcore.cxx
---- svtools/bmpmaker/bmpcore.cxx 24 Apr 2003 13:01:46 -0000 1.12
-+++ svtools/bmpmaker/bmpcore.cxx 26 Sep 2003 10:58:13 -0000
-@@ -107,7 +107,8 @@ void BmpCreator::ImplCreate( SvStream& r
- const ::std::vector< DirEntry >& rInDirs,
- const DirEntry& rOut,
- const String& rName,
-- const LangInfo& rLang )
-+ const LangInfo& rLang,
-+ const Color& rMaskColor)
- {
- const sal_uInt32 nOldPos = pSRS->Tell();
- const char* pCollectFile = getenv( "BMP_COLLECT_FILE" );
-@@ -215,7 +216,7 @@ void BmpCreator::ImplCreate( SvStream& r
- SvFileStream aIStm( aFileName, STREAM_READ );
- aIStm >> aBmp;
- aIStm.Close();
--
-+
- if( pCollectStm && !aBmp.IsEmpty() )
- {
- const ByteString aCollectString( aFileName, RTL_TEXTENCODING_ASCII_US );
-@@ -237,6 +238,26 @@ void BmpCreator::ImplCreate( SvStream& r
- }
- else
- {
-+ if (aBmp.GetBitCount () != 32)
-+ {
-+ aBmp.Convert (BMP_CONVERSION_32BIT);
-+
-+ BitmapWriteAccess *pUpd = aBmp.AcquireWriteAccess();
-+
-+ for( long nY = 0; nY < aSize.Height(); nY++ ) {
-+ for( long nX = 0; nX < aSize.Width(); nX++ ) {
-+ BitmapColor aCol;
-+ aCol = pUpd->GetPixel( nY, nX );
-+ if( aCol == rMaskColor )
-+ pUpd->SetAlpha( nY, nX, 0 );
-+ else
-+ pUpd->SetAlpha( nY, nX, 255 );
-+ }
-+ }
-+
-+ aBmp.ReleaseAccess( pUpd );
-+ }
-+
- if( aTotalBmp.IsEmpty() )
- {
- // first bitmap determines metrics of total bitmap
-@@ -267,6 +286,15 @@ void BmpCreator::ImplCreate( SvStream& r
- aBmp.Convert( BMP_CONVERSION_24BIT );
-
- aTotalBmp.CopyPixel( aDst, aSrc, &aBmp );
-+
-+ BitmapReadAccess *pSrc = aBmp.AcquireWriteAccess();
-+ BitmapWriteAccess *pDst = aTotalBmp.AcquireWriteAccess();
-+ for( long nY = 0; nY < aSize.Height(); nY++ )
-+ for( long nX = 0; nX < aSize.Width(); nX++ )
-+ pDst->SetAlpha( nY, nX + aDst.Left(), pSrc->GetAlpha( nY, nX ) );
-+ aTotalBmp.ReleaseAccess( pDst );
-+ aBmp.ReleaseAccess( pSrc );
-+
- aValidBmpBitVector[ n ] = true;
- }
- }
-@@ -335,6 +363,13 @@ void BmpCreator::ImplCreate( SvStream& r
-
- // -----------------------------------------------------------------------------
-
-+static sal_Int32 GetColorVal( const ByteString &rLine )
-+{
-+ ByteString aVal( rLine.GetToken( 1, '=' ) );
-+ aVal.EraseLeadingChars();
-+ return aVal.ToInt32() / 256;
-+}
-+
- void BmpCreator::Create( const String& rSRSName,
- const ::std::vector< String >& rInDirs,
- const String& rOutName,
-@@ -395,6 +430,8 @@ void BmpCreator::Create( const String& r
-
- const String aName( aText.GetToken( 1, '"' ) );
-
-+ Color aMaskColor;
-+
- do
- {
- if( !bLangDep &&
-@@ -405,6 +442,13 @@ void BmpCreator::Create( const String& r
- bLangDep = TRUE;
- }
-
-+ if( aByteText.Search( "Red" ) != STRING_NOTFOUND )
-+ aMaskColor.SetRed( GetColorVal( aByteText ) );
-+ if( aByteText.Search( "Green" ) != STRING_NOTFOUND )
-+ aMaskColor.SetGreen( GetColorVal( aByteText ) );
-+ if( aByteText.Search( "Blue" ) != STRING_NOTFOUND )
-+ aMaskColor.SetBlue( GetColorVal( aByteText ) );
-+
- if (!pSRS->ReadLine(aByteText))
- break;
- }
-@@ -415,7 +459,7 @@ void BmpCreator::Create( const String& r
- if( aText.Len() )
- {
- bDone = TRUE;
-- ImplCreate( *pSRS, aInDirs, aOutDir, aName, rLang );
-+ ImplCreate( *pSRS, aInDirs, aOutDir, aName, rLang, aMaskColor );
- }
- else if( ( rLang.mnLangNum != 49 ) && !bLangDep )
- {
-
-Index: vcl/source/gdi/bitmap.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/bitmap.cxx,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 bitmap.cxx
---- vcl/source/gdi/bitmap.cxx 24 Apr 2003 14:56:22 -0000 1.7
-+++ vcl/source/gdi/bitmap.cxx 12 Sep 2003 14:18:51 -0000
-@@ -980,7 +984,9 @@ BOOL Bitmap::CopyPixel( const Rectangle&
- {
- long nNextIndex = 0L;
-
-- if( ( nSrcBitCount == 24 ) && ( nDstBitCount < 24 ) )
-+ if (nSrcBitCount == 32 && nDstBitCount < 32)
-+ Convert (BMP_CONVERSION_32BIT);
-+ else if( ( nSrcBitCount == 24 ) && ( nDstBitCount < 24 ) )
- Convert( BMP_CONVERSION_24BIT );
- else if( ( nSrcBitCount == 8 ) && ( nDstBitCount < 8 ) )
- {
-@@ -1772,20 +1778,58 @@ Bitmap Bitmap::CreateDisplayBitmap( Outp
-
- // ------------------------------------------------------------------
-
-+static BYTE doSaturate( BYTE c, BYTE i)
-+{
-+ int v = 1.2 * c - 0.2 * i;
-+ if( v < 0 )
-+ return 0;
-+ else if( v > 255 )
-+ return 255;
-+ else
-+ return v;
-+}
-+
- Bitmap Bitmap::GetColorTransformedBitmap( BmpColorMode eColorMode ) const
- {
- Bitmap aRet( *this );
-- Color* pSrcColors = NULL;
-- Color* pDstColors = NULL;
-- ULONG nColorCount = 0;
--
-- Image::GetColorTransformArrays( (ImageColorTransform) eColorMode, pSrcColors, pDstColors, nColorCount );
-
-- if( nColorCount && pSrcColors && pDstColors )
-- aRet.Replace( pSrcColors, pDstColors, nColorCount );
-+ if (eColorMode == BMP_COLOR_HIGHCONTRAST && GetBitCount() >= 24) {
-
-- delete[] pSrcColors;
-- delete[] pDstColors;
-+ // Yet another special case for icons
-+ BitmapReadAccess* pAcc = AcquireReadAccess();
-+ BitmapWriteAccess* pDis = aRet.AcquireWriteAccess();
-+
-+ Size aSize = GetSizePixel();
-+
-+ for( long nY = 0; nY < aSize.Height(); nY++ ) {
-+ for( long nX = 0; nX < aSize.Width(); nX++ ) {
-+ BitmapColor col = pAcc->GetPixel( nY, nX );
-+ BYTE i = ( col.GetRed() * 0.3 + // magic numbers from gdk-pixbuf
-+ col.GetGreen() * 0.59 +
-+ col.GetBlue () * 0.11 );
-+ col.SetRed (doSaturate ( col.GetRed(), i ) );
-+ col.SetGreen (doSaturate ( col.GetGreen(), i ) );
-+ col.SetBlue (doSaturate ( col.GetBlue(), i ) );
-+ pDis->SetPixel( nY, nX, col );
-+ }
-+ }
-+
-+ aRet.ReleaseAccess( pDis );
-+ ReleaseAccess( pAcc );
-+ } else {
-+
-+ Color* pSrcColors = NULL;
-+ Color* pDstColors = NULL;
-+ ULONG nColorCount = 0;
-+
-+ Image::GetColorTransformArrays( (ImageColorTransform) eColorMode, pSrcColors, pDstColors, nColorCount );
-+
-+ if( nColorCount && pSrcColors && pDstColors )
-+ aRet.Replace( pSrcColors, pDstColors, nColorCount );
-+
-+ delete[] pSrcColors;
-+ delete[] pDstColors;
-+ }
-
- return aRet;
- }
-Index: vcl/inc/bitmap.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/bitmap.hxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 bitmap.hxx
---- vcl/inc/bitmap.hxx 24 Apr 2003 14:56:11 -0000 1.8
-+++ vcl/inc/bitmap.hxx 13 Sep 2003 10:30:56 -0000
-@@ -125,7 +125,8 @@ enum BmpConversion
- BMP_CONVERSION_24BIT = 7,
- BMP_CONVERSION_4BIT_TRANS = 8,
- BMP_CONVERSION_8BIT_TRANS = 9,
-- BMP_CONVERSION_GHOSTED = 10
-+ BMP_CONVERSION_GHOSTED = 10,
-+ BMP_CONVERSION_32BIT = 11
- };
-
- // ------------------------------------------------------------------------
-@@ -389,6 +390,7 @@ public:
- ULONG GetChecksum() const;
-
- Bitmap CreateDisplayBitmap( OutputDevice* pDisplay );
-+ Bitmap GetAlphaMask() const;
- Bitmap GetColorTransformedBitmap( BmpColorMode eColorMode ) const;
-
- static const BitmapPalette& GetGreyPalette( USHORT nEntries );
-Index: svtools/bmpmaker/bmpcore.hxx
-===================================================================
-RCS file: /cvs/util/svtools/bmpmaker/bmpcore.hxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 bmpcore.hxx
---- svtools/bmpmaker/bmpcore.hxx 30 Oct 2002 16:27:55 -0000 1.3
-+++ svtools/bmpmaker/bmpcore.hxx 13 Sep 2003 11:10:27 -0000
-@@ -112,7 +112,8 @@ private:
- const ::std::vector< DirEntry >& rInDirs,
- const DirEntry& rOut,
- const String& rName,
-- const LangInfo& rLang );
-+ const LangInfo& rLang,
-+ const Color& rMaskColor );
-
- protected:
-
-Index: vcl/inc/bmpacc.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/bmpacc.hxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 bmpacc.hxx
---- vcl/inc/bmpacc.hxx 28 Jun 2001 13:08:49 -0000 1.3
-+++ vcl/inc/bmpacc.hxx 24 Sep 2003 16:36:25 -0000
-@@ -203,6 +203,7 @@ public:
- inline BitmapColor GetPixel( long nY, long nX ) const;
- inline BitmapColor GetColor( long nY, long nX ) const;
- inline BYTE GetLuminance( long nY, long nX ) const;
-+ inline BYTE GetAlpha( long nY, long nX ) const;
- };
-
- // ---------------------
-@@ -235,6 +236,7 @@ public:
- inline void SetPaletteColor( USHORT nColor, const BitmapColor& rBitmapColor );
-
- inline void SetPixel( long nY, long nX, const BitmapColor& rBitmapColor );
-+ inline void SetAlpha( long nY, long nX, const BYTE nAlpha );
-
- inline void SetLineColor( const BitmapColor& rColor );
- inline const BitmapColor& GetLineColor() const;
-@@ -455,6 +457,16 @@ inline BYTE BitmapReadAccess::GetLuminan
-
- // ------------------------------------------------------------------
-
-+inline BYTE BitmapReadAccess::GetAlpha( long nY, long nX ) const
-+{
-+ if( maBitmap.GetBitCount() != 32 )
-+ return 255;
-+ else
-+ return mpScanBuf[ nY ] [ ( nX << 2 ) + 3 ];
-+}
-+
-+// ------------------------------------------------------------------
-+
- inline BitmapWriteAccess::BitmapWriteAccess( Bitmap& rBitmap ) :
- BitmapReadAccess( rBitmap, TRUE ),
- maLineColor ( 0, 0, 0 ),
-@@ -541,6 +553,12 @@ inline void BitmapWriteAccess::SetPixel(
- BMP_ASSERT( nX < mpBuffer->mnWidth, "x-coordinate out of range!" );
- BMP_ASSERT( nY < mpBuffer->mnHeight, "y-coordinate out of range!" );
- mFncSetPixel( mpScanBuf[ nY ], nX, rBitmapColor, maColorMask );
-+}
-+
-+inline void BitmapWriteAccess::SetAlpha( long nY, long nX, const BYTE nAlpha )
-+{
-+ if( maBitmap.GetBitCount() == 32 )
-+ mpScanBuf[ nY ] [ ( nX << 2 ) + 3 ] = nAlpha;
- }
-
- #endif // _SV_BMPACC_HXX
-Index: vcl/source/gdi/bmpacc2.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/bmpacc2.cxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 bmpacc2.cxx
---- vcl/source/gdi/bmpacc2.cxx 28 Jun 2001 13:10:36 -0000 1.2
-+++ vcl/source/gdi/bmpacc2.cxx 24 Sep 2003 16:36:49 -0000
-@@ -277,7 +278,7 @@ IMPL_FORMAT_GETPIXEL( _32BIT_TC_ABGR )
-
- IMPL_FORMAT_SETPIXEL( _32BIT_TC_ABGR )
- {
-- *( pScanline = pScanline + ( nX << 2 ) )++ = 0;
-+ pScanline += ( nX << 2 ) + 1;
- *pScanline++ = rBitmapColor.GetBlue();
- *pScanline++ = rBitmapColor.GetGreen();
- *pScanline = rBitmapColor.GetRed();
-@@ -300,7 +302,7 @@ IMPL_FORMAT_GETPIXEL( _32BIT_TC_ARGB )
-
- IMPL_FORMAT_SETPIXEL( _32BIT_TC_ARGB )
- {
-- *( pScanline = pScanline + ( nX << 2 ) )++ = 0;
-+ pScanline = pScanline + ( nX << 2 ) + 1;
- *pScanline++ = rBitmapColor.GetRed();
- *pScanline++ = rBitmapColor.GetGreen();
- *pScanline = rBitmapColor.GetBlue();
-@@ -326,7 +328,6 @@ IMPL_FORMAT_SETPIXEL( _32BIT_TC_BGRA )
- *( pScanline = pScanline + ( nX << 2 ) )++ = rBitmapColor.GetBlue();
- *pScanline++ = rBitmapColor.GetGreen();
- *pScanline++ = rBitmapColor.GetRed();
-- *pScanline = 0;
- }
-
- // ------------------------------------------------------------------
-@@ -349,7 +350,6 @@ IMPL_FORMAT_SETPIXEL( _32BIT_TC_RGBA )
- *( pScanline = pScanline + ( nX << 2 ) )++ = rBitmapColor.GetRed();
- *pScanline++ = rBitmapColor.GetGreen();
- *pScanline++ = rBitmapColor.GetBlue();
-- *pScanline = 0;
- }
-
- // ------------------------------------------------------------------
-Index: vcl/source/gdi/bitmap3.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/bitmap3.cxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 bitmap3.cxx
---- vcl/source/gdi/bitmap3.cxx 27 Aug 2001 12:57:08 -0000 1.3
-+++ vcl/source/gdi/bitmap3.cxx 24 Sep 2003 16:39:29 -0000
-@@ -401,6 +401,13 @@ BOOL Bitmap::Convert( BmpConversion eCon
- bRet = ImplConvertGhosted();
- break;
-
-+ case BMP_CONVERSION_32BIT:
-+ if (nBitCount < 32)
-+ bRet = ImplConvertUp (32, FALSE);
-+ else
-+ bRet = TRUE;
-+ break;
-+
- default:
- DBG_ERROR( "Bitmap::Convert(): Unsupported conversion" );
- break;
-@@ -1074,7 +1081,8 @@ BOOL Bitmap::ImplScaleInterpolate( const
- BitmapReadAccess* pReadAcc = AcquireReadAccess();
- long nWidth = pReadAcc->Width();
- long nHeight = pReadAcc->Height();
-- Bitmap aNewBmp( Size( nNewWidth, nHeight ), 24 );
-+ Bitmap aNewBmp( Size( nNewWidth, nHeight ),
-+ GetBitCount() == 32 ? 32 : 24 );
- BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
- long* pLutInt;
- long* pLutFrac;
-@@ -1184,7 +1192,8 @@ BOOL Bitmap::ImplScaleInterpolate( const
- bRet = FALSE;
- ImplAssignWithSize( aNewBmp );
- pReadAcc = AcquireReadAccess();
-- aNewBmp = Bitmap( Size( nNewWidth, nNewHeight ), 24 );
-+ aNewBmp = Bitmap( Size( nNewWidth, nNewHeight ),
-+ GetBitCount() == 32 ? 32 : 24 );
- pWriteAcc = aNewBmp.AcquireWriteAccess();
-
- if( pReadAcc && pWriteAcc )
-Index: vcl/source/gdi/bitmap2.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/bitmap2.cxx,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 bitmap2.cxx
---- vcl/source/gdi/bitmap2.cxx 24 Apr 2003 13:17:58 -0000 1.4
-+++ vcl/source/gdi/bitmap2.cxx 24 Sep 2003 16:40:07 -0000
-@@ -204,7 +204,8 @@ BOOL Bitmap::ImplReadDIB( SvStream& rISt
- {
- USHORT nBitCount = ( aHeader.nBitCount <= 1 ) ? 1 :
- ( aHeader.nBitCount <= 4 ) ? 4 :
-- ( aHeader.nBitCount <= 8 ) ? 8 : 24;
-+ ( aHeader.nBitCount <= 8 ) ? 8 :
-+ ( aHeader.nBitCount <= 24 ) ? 24 : 32;
-
- const Size aSizePixel( aHeader.nWidth, aHeader.nHeight );
- BitmapPalette aDummyPal;
-@@ -640,6 +641,7 @@ BOOL Bitmap::ImplReadDIBBits( SvStream&
- ColorMask aMask( nRMask, nGMask, nBMask );
- BitmapColor aColor;
- UINT32* pTmp32;
-+ UINT32 nCol;
-
- for( long nY = rHeader.nHeight - 1L; nY >= 0L; nY-- )
- {
-@@ -647,8 +649,10 @@ BOOL Bitmap::ImplReadDIBBits( SvStream&
-
- for( long nX = 0L; nX < nWidth; nX++ )
- {
-- aMask.GetColorFor32Bit( aColor, (BYTE*) pTmp32++ );
-+ BYTE *pPix = (BYTE *) pTmp32++;
-+ aMask.GetColorFor32Bit( aColor, pPix );
- rAcc.SetPixel( nY, nX, aColor );
-+ rAcc.SetAlpha( nY, nX, pPix[ 3 ] );
- }
- }
- }
-@@ -1009,6 +1013,27 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream&
- }
- break;
-
-+ case 24:
-+ {
-+ BitmapColor aPixelColor;
-+
-+ for( long nY = nHeight - 1; nY >= 0L; nY-- )
-+ {
-+ pTmp = pBuf;
-+
-+ for( long nX = 0L; nX < nWidth; nX++ )
-+ {
-+ aPixelColor = rAcc.GetPixel( nY, nX );
-+ *pTmp++ = aPixelColor.GetBlue();
-+ *pTmp++ = aPixelColor.GetGreen();
-+ *pTmp++ = aPixelColor.GetRed();
-+ }
-+
-+ rOStm.Write( pBuf, nAlignedWidth );
-+ }
-+ }
-+ break;
-+
- default:
- {
- BitmapColor aPixelColor;
-@@ -1023,6 +1048,7 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream&
- *pTmp++ = aPixelColor.GetBlue();
- *pTmp++ = aPixelColor.GetGreen();
- *pTmp++ = aPixelColor.GetRed();
-+ *pTmp++ = rAcc.GetAlpha( nY, nX );
- }
-
- rOStm.Write( pBuf, nAlignedWidth );
-@@ -1038,6 +1064,38 @@ BOOL Bitmap::ImplWriteDIBBits( SvStream&
- rImageSize = rOStm.Tell() - rImageSize;
-
- return( rOStm.GetError() == 0UL );
-+}
-+
-+// ------------------------------------------------------------------
-+
-+Bitmap
-+Bitmap::GetAlphaMask() const
-+{
-+ if( GetBitCount() < 32 )
-+ return Bitmap();
-+
-+ Size aSize = GetSizePixel();
-+ Bitmap aAlpha( aSize, 8, &GetGreyPalette( 256 ) );
-+
-+ aAlpha.Erase( COL_WHITE );
-+
-+ BitmapReadAccess *pSrc = AcquireReadAccess();
-+ BitmapWriteAccess *pDst = aAlpha.AcquireWriteAccess();
-+
-+ for( long nY = 0; nY < aSize.Height(); nY++ )
-+ {
-+ for( long nX = 0; nX < aSize.Width(); nX++ )
-+ {
-+ BitmapColor aCol;
-+ aCol = pSrc->GetPixel( nY, nX );
-+ pDst->SetPixel( nY, nX, BitmapColor( 255 - pSrc->GetAlpha( nY, nX ) ) );
-+ }
-+ }
-+
-+ ReleaseAccess( pSrc );
-+ ReleaseAccess( pDst );
-+
-+ return aAlpha;
- }
-
- // ------------------------------------------------------------------
+++ /dev/null
---- oo_1.0_src/sd/source/ui/app/makefile.mk.suxx Fri Jun 14 11:29:42 2002
-+++ oo_1.0_src/sd/source/ui/app/makefile.mk Fri Jun 14 11:33:27 2002
-@@ -132,15 +132,15 @@
- $(INCCOM)$/sddll0.hxx: makefile.mk
- +@echo $@
- .IF "$(GUI)"=="OS2"
-- echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX)" >$@
-+ echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX)\" >$@
- .ELSE
- .IF "$(GUI)"=="MAC"
- echo "$(HASHMARK)define DLL_NAME ¶"sd$(UPD)$(DLLPOSTFIX).dll¶"" > $@
- .ELSE
- .IF "$(GUI)"=="UNX"
-- echo #define DLL_NAME \"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+ echo "#define DLL_NAME "\"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
-- echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX).DLL" >$@
-+ echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX).DLL\" >$@
- .ENDIF
- .ENDIF
- .ENDIF
---- oo_1.0_src/sch/source/ui/app/makefile.mk.suxx Fri Jun 14 11:29:53 2002
-+++ oo_1.0_src/sch/source/ui/app/makefile.mk Fri Jun 14 11:34:03 2002
-@@ -113,16 +113,16 @@
-
- $(INCCOM)$/schlib.hxx: makefile.mk
- .IF "$(GUI)"=="OS2"
-- echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)" >$@
-+ echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)\" >$@
- .ELSE
- .IF "$(GUI)"=="MAC"
- echo "$(HASHMARK)define DLL_NAME ¶"sch$(UPD)$(DLLPOSTFIX).dll¶"" > $@
- .ELSE
- .IF "$(GUI)"=="UNX"
- $(RM) $@
-- echo #define DLL_NAME \"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+ echo "#define DLL_NAME "\"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
-- echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
-+ echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
- .ENDIF
- .ENDIF
---- oo_1.0_src/sal/util/makefile.mk.suxx Fri Jun 14 11:30:06 2002
-+++ oo_1.0_src/sal/util/makefile.mk Fri Jun 14 11:35:42 2002
-@@ -245,14 +245,14 @@
- .IF "$(GUI)"=="WNT"
-
- $(OUT)$/inc$/udkversion.h:
-- echo #ifndef _SAL_UDKVERSION_H_ > $@
-- echo #define _SAL_UDKVERSION_H_ >> $@
-- echo. >> $@
-- echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
-- echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
-- echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
-- echo. >> $@
-- echo #endif >> $@
-+ echo "#ifndef _SAL_UDKVERSION_H_" > $@
-+ echo "#define _SAL_UDKVERSION_H_" >> $@
-+ echo >> $@
-+ echo "#define SAL_UDK_MAJOR $(UDK_MAJOR)" >> $@
-+ echo "#define SAL_UDK_MINOR $(UDK_MINOR)" >> $@
-+ echo "#define SAL_UDK_MICRO $(UDK_MICRO)" >> $@
-+ echo >> $@
-+ echo "#endif" >> $@
-
- .ELSE
-
---- oo_1.0_src/sc/source/ui/app/makefile.mk.suxx Fri Jun 14 11:30:24 2002
-+++ oo_1.0_src/sc/source/ui/app/makefile.mk Fri Jun 14 11:36:11 2002
-@@ -115,15 +115,15 @@
-
- $(INCCOM)$/scdll0.hxx: makefile.mk
- .IF "$(GUI)"=="OS2"
-- echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)" >$@
-+ echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)\" >$@
- .ELSE
- .IF "$(GUI)"=="MAC"
- echo "$(HASHMARK)define DLL_NAME ¶"sc$(UPD)$(DLLPOSTFIX).dll¶"" > $@
- .ELSE
- .IF "$(GUI)"=="UNX"
-- echo #define DLL_NAME \"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+ echo "#define DLL_NAME "\"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
-- echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
-+ echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
- .ENDIF
- .ENDIF
---- oo_1.0_src/basctl/source/basicide/makefile.mk.suxx Fri Jun 14 05:11:03 2002
-+++ oo_1.0_src/basctl/source/basicide/makefile.mk Fri Jun 14 05:12:32 2002
-@@ -153,7 +153,7 @@
- .ELSE
- .IF "$(GUI)"=="UNX"
- $(RM) $@
-- echo #define DLL_NAME \"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+ echo "#define DLL_NAME "\"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
- echo #define DLL_NAME "basctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
- .ENDIF
---- oo_1.0_src/sw/source/ui/app/makefile.mk.suxx Fri Jun 14 11:30:36 2002
-+++ oo_1.0_src/sw/source/ui/app/makefile.mk Fri Jun 14 11:36:31 2002
-@@ -152,12 +152,12 @@
-
- .IF "$(GUIBASE)"=="WIN"
- $(INCCOM)$/swdll0.hxx: makefile.mk
-- echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@
-+ echo "#define DLL_NAME "\"sw$(UPD)$(DLLPOSTFIX).DLL\" >$@
- .ENDIF
-
- .IF "$(GUI)"=="UNX"
- $(INCCOM)$/swdll0.hxx: makefile.mk
-- echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+ echo "#define DLL_NAME "\"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
-
-
---- oo_1.0_src/starmath/source/makefile.mk.suxx Fri Jun 14 11:30:45 2002
-+++ oo_1.0_src/starmath/source/makefile.mk Fri Jun 14 11:36:46 2002
-@@ -140,9 +140,9 @@
- $(INCCOM)$/dllname.hxx: makefile.mk
- .IF "$(GUI)"=="UNX"
- $(RM) $@
-- echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
-+ echo "#define DLL_NAME "\"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ELSE
-- echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
-+ echo "#define DLL_NAME "\"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
- .ENDIF
-
- $(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
---- oo_1.0_src/solenv/inc/_tg_app.mk.suxx Fri Jun 14 11:30:57 2002
-+++ oo_1.0_src/solenv/inc/_tg_app.mk Fri Jun 14 11:39:21 2002
-@@ -113,8 +113,8 @@
- @-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
- .ENDIF
- .IF "$(APP1VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
-- @-+echo #include "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP1LINKRES:b).rc
-+ @-+echo "#include "\"$(APP1VERINFO)\" >> $(MISC)$/$(APP1LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
- .ENDIF # "$(APP1LINKRES)" != ""
-@@ -309,8 +309,8 @@
- @-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
- .ENDIF
- .IF "$(APP2VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
-- @-+echo #include "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP2LINKRES:b).rc
-+ @-+echo "#include "\"$(APP2VERINFO)\" >> $(MISC)$/$(APP2LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
- .ENDIF # "$(APP2LINKRES)" != ""
-@@ -505,8 +505,8 @@
- @-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
- .ENDIF
- .IF "$(APP3VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
-- @-+echo #include "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP3LINKRES:b).rc
-+ @-+echo "#include "\"$(APP3VERINFO)\" >> $(MISC)$/$(APP3LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
- .ENDIF # "$(APP3LINKRES)" != ""
-@@ -701,8 +701,8 @@
- @-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
- .ENDIF
- .IF "$(APP4VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
-- @-+echo #include "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP4LINKRES:b).rc
-+ @-+echo "#include "\"$(APP4VERINFO)\" >> $(MISC)$/$(APP4LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
- .ENDIF # "$(APP4LINKRES)" != ""
-@@ -897,8 +897,8 @@
- @-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
- .ENDIF
- .IF "$(APP5VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
-- @-+echo #include "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP5LINKRES:b).rc
-+ @-+echo "#include \"$(APP5VERINFO)\" >> $(MISC)$/$(APP5LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
- .ENDIF # "$(APP5LINKRES)" != ""
-@@ -1093,8 +1093,8 @@
- @-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
- .ENDIF
- .IF "$(APP6VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
-- @-+echo #include "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP6LINKRES:b).rc
-+ @-+echo "#include "\"$(APP6VERINFO)\" >> $(MISC)$/$(APP6LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
- .ENDIF # "$(APP6LINKRES)" != ""
-@@ -1289,8 +1289,8 @@
- @-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
- .ENDIF
- .IF "$(APP7VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
-- @-+echo #include "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP7LINKRES:b).rc
-+ @-+echo "#include "\"$(APP7VERINFO)\" >> $(MISC)$/$(APP7LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
- .ENDIF # "$(APP7LINKRES)" != ""
-@@ -1485,8 +1485,8 @@
- @-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
- .ENDIF
- .IF "$(APP8VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
-- @-+echo #include "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP8LINKRES:b).rc
-+ @-+echo "#include "\"$(APP8VERINFO)\" >> $(MISC)$/$(APP8LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
- .ENDIF # "$(APP8LINKRES)" != ""
-@@ -1681,8 +1681,8 @@
- @-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
- .ENDIF
- .IF "$(APP9VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
-- @-+echo #include "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP9LINKRES:b).rc
-+ @-+echo "#include "\"$(APP9VERINFO)\" >> $(MISC)$/$(APP9LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
- .ENDIF # "$(APP9LINKRES)" != ""
-@@ -1877,8 +1877,8 @@
- @-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
- .ENDIF
- .IF "$(APP10VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
-- @-+echo #include "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP10LINKRES:b).rc
-+ @-+echo "#include "\"$(APP10VERINFO)\" >> $(MISC)$/$(APP10LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
- .ENDIF # "$(APP10LINKRES)" != ""
---- oo_1.0_src/solenv/inc/_tg_shl.mk.suxx Fri Jun 14 11:31:07 2002
-+++ oo_1.0_src/solenv/inc/_tg_shl.mk Fri Jun 14 11:43:39 2002
-@@ -231,15 +231,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
-@@ -693,15 +693,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
-@@ -1155,15 +1155,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
-@@ -1617,15 +1617,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
-@@ -2079,15 +2079,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
-@@ -2541,15 +2541,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
-@@ -3003,15 +3003,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
-@@ -3465,15 +3465,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
-@@ -3927,15 +3927,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
-@@ -4389,15 +4389,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
---- oo_1.0_src/solenv/inc/tg_app.mk.suxx Fri Jun 14 11:31:29 2002
-+++ oo_1.0_src/solenv/inc/tg_app.mk Fri Jun 14 11:44:23 2002
-@@ -208,8 +208,8 @@
- @-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- .ENDIF
- .IF "$(APP$(TNR)VERINFO)" != ""
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-- @-+echo #include "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-+ @-+echo "#include "\"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- .ENDIF
- $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- .ENDIF # "$(APP$(TNR)LINKRES)" != ""
---- oo_1.0_src/solenv/inc/tg_dep.mk.suxx Fri Jun 14 11:31:37 2002
-+++ oo_1.0_src/solenv/inc/tg_dep.mk Fri Jun 14 11:44:35 2002
-@@ -124,9 +124,9 @@
- @echo "#" > $(MISC)$/$(TARGET).dpw
- .ENDIF
- .ELSE # "$(GUI)"=="UNX"
-- @echo # > $(MISC)$/$(TARGET).dpc
-+ @echo "#" > $(MISC)$/$(TARGET).dpc
- .IF "$(GROUP)"=="WRITER"
-- @echo # > $(MISC)$/$(TARGET).dpw
-+ @echo "#" > $(MISC)$/$(TARGET).dpw
- .ENDIF
- .ENDIF # "$(GUI)"=="UNX"
-
---- oo_1.0_src/solenv/inc/tg_shl.mk.suxx Fri Jun 14 11:31:45 2002
-+++ oo_1.0_src/solenv/inc/tg_shl.mk Fri Jun 14 11:45:07 2002
-@@ -331,15 +331,15 @@
- .ENDIF
- .IF "$(use_shl_versions)" != ""
- .IF "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-- @-+echo #include \"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- .ELSE # "$(USE_SHELL)"!="4nt"
-- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-- @-+echo #define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-- @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#define VERVARIANT" $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#define ORG_NAME" $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#define INTERNAL_NAME" $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
-+ @-+echo "#include \"shlinfo.rc\"" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- .ENDIF # "$(USE_SHELL)"!="4nt"
- .ENDIF # "$(use_shl_versions)" != ""
- $(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
---- oo_1.0_src/tools/os2/source/wps/makefile.mk.suxx Fri Jun 14 11:47:53 2002
-+++ oo_1.0_src/tools/os2/source/wps/makefile.mk Fri Jun 14 11:48:23 2002
-@@ -211,8 +211,8 @@
- @+if exist $(INCCOM)$/wpsdll.h rm -f $(INCCOM)$/wpsdll.h
- @echo ----------------------------
- @echo Making: $@
-- @echo #define _WPS_DLL_NAME "$(SHL1TARGET).dll" > $(INCCOM)$/wpsdll.h
-- @echo #define _TEMPLATES_DLL_NAME "$(SHL2TARGET)" >> $(INCCOM)$/wpsdll.h
-+ @echo "#define _WPS_DLL_NAME "\"$(SHL1TARGET).dll\" > $(INCCOM)$/wpsdll.h
-+ @echo "#define _TEMPLATES_DLL_NAME "\"$(SHL2TARGET)\" >> $(INCCOM)$/wpsdll.h
-
- $(SHL1DEF):
- @echo ----------------------------
+++ /dev/null
---- instsetoo/prj/build.lst.org 2004-03-30 08:45:34.000000000 +0000
-+++ instsetoo/prj/build.lst 2004-03-30 08:46:48.000000000 +0000
-@@ -1,3 +1,3 @@
--oo instsetoo : UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker embedserv pyuno crashrep virgule NULL
-+oo instsetoo : UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker embedserv pyuno virgule NULL
- oo instsetoo usr1 - all oo_mkout NULL
- oo instsetoo\util nmake - all oo_util NULL
-
+++ /dev/null
-Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.82
-diff -u -p -u -r1.82 Common.xcs
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 17 Jul 2003 13:07:14 -0000 1.82
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 5 Aug 2003 14:05:18 -0000
-@@ -5075,9 +5075,9 @@
- <label xml:lang="x-comment">Capitalize first letter of every sentence</label>
- <label xml:lang="sk">KaĆŸdĂ© prvĂ© pĂsmeno vety veÄŸkĂœm</label>
- </info>
-- <value>true</value>
-- </prop>
-- <prop oor:name="ChangeUnderlineWeight" oor:type="xs:boolean">
-+ <value>false</value>
-+ </prop> <!-- patch1 -->
-+ <prop oor:name="ChangeUnderlineWeight" oor:type="xs:boolean"> <!-- patch2 -->
- <!-- OldPath: AutoCorrect/Options/All -->
- <!-- OldLocation: Soffice.cfg -->
- <!-- UIHints: Tools AutoCorrect/AutoFormat Options - Automatic *bold* and _underline_ -->
+++ /dev/null
-# CLK_TCK was obsoleted by CLOCKS_PER_SEC
---- oo_641c_src/tools/source/datetime/ttime.cxx.jj Mon Jun 11 19:17:46 2001
-+++ oo_641c_src/tools/source/datetime/ttime.cxx Mon Jan 14 20:55:07 2002
-@@ -493,7 +493,7 @@ ULONG Time::GetSystemTicks()
-
- if ( !nImplTicksPerSecond )
- {
-- nImplTicksPerSecond = CLK_TCK;
-+ nImplTicksPerSecond = CLOCKS_PER_SEC;
- dImplTicksPerSecond = nImplTicksPerSecond;
- dImplTicksULONGMAX = (double)(ULONG)ULONG_MAX;
- }
+++ /dev/null
---- oo/config_office/configure.in.old Fri Nov 1 20:24:40 2002
-+++ oo/config_office/configure.in Fri Nov 1 20:32:31 2002
-@@ -789,93 +789,16 @@
- _correct_jdk_exists="false"
- dnl java -version sends output to stderr!
- _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }'`
-- if test "$_os" = "SunOS" -o "$_os" = "OSF1"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-- if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-- _jdk_minor="true"
-- fi
-- fi
-- if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
--
-- if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-- _jdk_minor="true"
-- fi
-- fi
-
-- if test "$_os" = "Linux" -a "$_machine_type" = "i686" -o "$_os" = "FreeBSD"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+ _jdk_ver=`echo "$_jdk" | awk -F . '{ printf "%d", (($1 * 100) + $2) * 100 + $3;}'`
-
-- if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-- _jdk_minor="true"
-- fi
-- fi
-- if test "$_os" = "NetBSD"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "Linux" -a "$_machine_type" = "ppc"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "WINNT"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-- _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
--
-- if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-- _jdk_minor="true"
-- fi
-- fi
-- if test "$_os" = "Darwin"; then
-- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-- fi
-- if test "$_jdk_middle" = "true"; then
-- if test "$_os" = "SunOS" -o "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "FreeBSD"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "NetBSD"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "Linux"; then
-- if test "$_machine_type" = "i686"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_machine_type" = "sparc"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_machine_type" = "ppc"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_machine_type" = "armv4l"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- fi
-- if test "$_os" = "OSF1"; then
-- _jdk_minor=`echo $_jdk | $AWK -F- '{print $1}' | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "WINNT"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-- fi
-- if test "$_os" = "Darwin"; then
-- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 0) print "false"; else print "true" }'`
-- fi
-- fi
-- if test "$_jdk_minor" = "true"; then
-+ if test "$_jdk_ver" -lt 10300; then
-+ AC_MSG_WARN([You need at least jdk-1.3])
-+ _correct_jdk_exists="false"
-+ else
- _correct_jdk_exists="true"
- JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"`
- AC_MSG_RESULT([checked (JDK $_jdk)])
-- else
-- _correct_jdk_exists="false"
- fi
- else
- _correct_jdk_exists="false"
+++ /dev/null
-Index: sfx2/source/control/bindings.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/control/bindings.cxx,v
-retrieving revision 1.25
-diff -u -p -u -r1.25 bindings.cxx
---- sfx2/source/control/bindings.cxx 28 May 2003 13:25:06 -0000 1.25
-+++ sfx2/source/control/bindings.cxx 28 Aug 2003 13:04:31 -0000
-@@ -2624,11 +2624,17 @@ SfxItemState SfxBindings::QueryState( sa
- pDisp = (SfxOfficeDispatch*)(nImplementation);
- }
-
-- if ( !pDisp || pDisp->IsInterceptDispatch() )
-+ if ( !pDisp || pDisp->IsInterceptDispatch() && pCache)
- {
- SfxItemState eState = SFX_ITEM_SET;
- SfxPoolItem *pItem=NULL;
-- BindDispatch_Impl *pBind = new BindDispatch_Impl( xDisp, aURL, NULL );
-+ SfxStateCache *pTmpCache = NULL;
-+ if( !pCache ) {
-+ pTmpCache = new SfxStateCache( nSlot );
-+ pCache = pTmpCache;
-+ }
-+
-+ BindDispatch_Impl *pBind = new BindDispatch_Impl( xDisp, aURL, pCache );
- pBind->acquire();
- xDisp->addStatusListener( pBind, aURL );
- if ( !pBind->GetStatus().IsEnabled )
-@@ -2668,6 +2674,8 @@ SfxItemState SfxBindings::QueryState( sa
-
- pBind->Release();
- rpState = pItem;
-+ if( pTmpCache )
-+ delete pTmpCache;
- return eState;
- }
- }
+++ /dev/null
-Index: vcl/source/gdi/mapmod.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/mapmod.cxx,v
-retrieving revision 1.1.1.1
-diff -u -p -u -r1.1.1.1 mapmod.cxx
---- vcl/source/gdi/mapmod.cxx 18 Sep 2000 17:05:38 -0000 1.1.1.1
-+++ vcl/source/gdi/mapmod.cxx 12 Sep 2003 16:51:13 -0000
-@@ -144,6 +144,12 @@ static ImplMapMode* ImplGetStaticMapMode
- static long aStaticImplMapModeAry[(MAP_LASTENUMDUMMY)*sizeof(ImplMapMode)/sizeof(long)];
- #endif
-
-+ if( eUnit >= MAP_LASTENUMDUMMY )
-+ {
-+ DBG_ASSERTWARNING( bRelMap, "Completely bogus map unit" );
-+ return ((ImplMapMode*)aStaticImplMapModeAry);
-+ }
-+
- ImplMapMode* pImplMapMode = ((ImplMapMode*)aStaticImplMapModeAry)+eUnit;
- if ( !pImplMapMode->mbSimple )
- {
+++ /dev/null
---- crashrep/prj/build.lst.orig 2003-06-25 16:19:29.000000000 +0200
-+++ crashrep/prj/build.lst 2003-12-11 12:31:29.000000000 +0100
-@@ -1,4 +1,4 @@
--cr crashrep : sal sysui gtk tools shell NULL
-+cr crashrep : sal sysui tools shell NULL
- cr crashrep usr1 - all cr_mkout NULL
- cr crashrep\scripts nmake - all cr_suscript NULL
- cr crashrep\source\all get - all cr_sresource NULL
+++ /dev/null
-diff -Nur oo.orig/crashrep/source/unx/makefile.mk oo.chng/crashrep/source/unx/makefile.mk
---- oo.orig/crashrep/source/unx/makefile.mk Wed Jul 30 19:57:00 2003
-+++ oo.chng/crashrep/source/unx/makefile.mk Thu Jul 31 10:44:25 2003
-@@ -115,7 +115,7 @@
- APP2TARGET=$(TARGET2)
- APP2OBJS=$(OBJFILES)
-
--APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lz -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lexpat `pkg-config --libs gtk+-2.0` -lexpat -lpng -lz -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
- .IF "$(OS)" == "SOLARIS"
- APP2STDLIBS+=-lsocket
- .ENDIF
+++ /dev/null
-#! /usr/bin/perl
-
-use strict;
-
-#- Define full path to unzip command
-my $UnzipCommand = "/usr/bin/unzip";
-
-#- Define the default setup file
-my $SetupConf = "setup.ins";
-
-#- Define the generated instdb.ins file
-my $InstDb = "instdb.ins";
-
-#- Define destination directory
-my $DestDir = "/usr/lib/openoffice";
-
-#- Define the zipfiles dir (will be the same as of setup.ins)
-my $SetupDir = ".";
-
-#- Define Product Version and Name
-my ($ProductName, $ProductVersion) = ("OpenOffice.org", "1.0.1");
-
-sub dirname { local $_ = shift; s|[^/]*/*\s*$||; s|(.)/*$|$1|; $_ || '.' }
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray() ? @l : join '', @l }
-sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 }
-sub output { my $f = shift; local *F; open F, ">$f" or die "output in file $f failed: $!\n"; print F foreach @_; 1 }
-
-sub mkdir_p {
- my ($dir) = @_;
- if (-d $dir) {
- # nothing to do
- } elsif (-e $dir) {
- die "mkdir: error creating directory $dir: $dir is a file and i won't delete it\n";
- } else {
- mkdir_p(dirname($dir));
- mkdir($dir, 0755) or die "mkdir: error creating directory $dir: $!\n";
- }
- 1;
-}
-
-while ( $ARGV[0] =~ /^-/ ) {
- $_ = shift;
- if (m/^-d(=(\S+))?/) {
- $DestDir = $2 || shift;
- }
- elsif (m/^-z(=(\S+))?/) {
- $UnzipCommand = $2 || shift;
- }
- elsif (m/^-i(=(\S+))?/) {
- $SetupConf = $2 || shift;
- $SetupDir = dirname $SetupConf;
- }
- elsif (m/^-o(=(\S+))?/) {
- $InstDb = $2 || shift;
- }
- elsif (m/^-pn(=(\S+))?/) {
- $ProductName = $2 || shift;
- }
- elsif (m/^-pv(=(\S+))?/) {
- $ProductVersion = $2 || shift;
- }
- else {
- die "$0: Unknown option $_\n";
- }
-}
-
-die "$0: Can't open $SetupConf\n"
- if ( ! -r $SetupConf );
-
-die "$UnzipCommand not found, please set the full path to the unzip command\n"
- if ( ! -x "$UnzipCommand" );
-
-my @exclude_modules = ( "GID_MODULE_OPTIONAL_GNOME",
- "gid_Module_Optional_Kde",
- "gid_Module_Optional_Cde" );
-
-my ($zipfile, $instdb);
-my $is_archive = 0;
-foreach (cat_("$SetupConf"), "EndOfFile\n") {
- if (/^\s*Installation/ ... /^\s*End/) {
- if (/^\s*ScriptVersion/) {
- $instdb .= "\tDestPath\t = \"$DestDir\";\n";
- $instdb .= "\tSourcePath\t = \"$DestDir/program\";\n";
- $instdb .= "\tMode\t\t = NETWORK;\n";
- $instdb .= "\tInstallFromNet = NO;\n";
- }
- }
- elsif (/^\s*Module\s+(\w+)\s*/ ... /^\s*End/) {
- my $module = $1;
- if (/^\s*Files/ || /^\s*Styles.+HIDDEN_ROOT/) {
- my $state = member($module, @exclude_modules) ? "NO" : "YES";
- $instdb .= "\tInstalled\t = $state;\n";
- }
- }
- elsif (/^\s*File/ ... /^\s*End/) {
- if (/^\s*End/) {
- if ($is_archive) {
- my @filelist;
- foreach (cat_("$UnzipCommand -l $zipfile |")) {
- push @filelist, { size => $1, name => $2 }
- if (/^\s+([0-9]+)\s+[-0-9]+\s+[:0-9]+\s+(.+)\s+/);
- }
- $instdb .= "\tContains\t = (";
- my $n = 0;
- foreach my $e (@filelist) {
- if (++$n > 10) {
- $instdb .= ",\n\t\t\t\t\t";
- $n = 1;
- }
- elsif ($n > 1) {
- $instdb .= ", ";
- }
- $instdb .= "\"$e->{name}:$e->{size}\"";
- }
- $instdb .= ");\n";
- $is_archive = 0;
- }
- }
- elsif (/^\s*Styles\s*=\s*.*ARCHIVE/) {
- $is_archive = 1;
- }
- elsif (/^\s*PackedName\s*=\s*"(\w+)"/) {
- $zipfile = "$SetupDir/$1";
- die "$0: zip file $zipfile not accessible"
- if ( ! -r "$zipfile" );
- }
- }
- $instdb .= $_ if !/^EndOfFile/;
-}
-
-# Implant Product Name and Version
-$instdb =~ s/%PRODUCTNAME/$ProductName/g;
-$instdb =~ s/%PRODUCTVERSION/$ProductVersion/g;
-$instdb =~ s/"<productkey>"/"$ProductName $ProductVersion"/g;
-$instdb =~ s/"<installmode>"/"NETWORK"/g;
-
-output $InstDb, $instdb;
+++ /dev/null
-# libdb_cxx-X.Y.so already includes all functions/variables from
-# libdb-X.Y.so. Having the same functionality twice in address space
-# means ~ .5MB bigger RAM usage and about 650 prelink conflicts.
-
---- oo_1.1_src/xmlhelp/util/makefile.mk.jj 2003-04-28 18:18:57.000000000 +0200
-+++ oo_1.1_src/xmlhelp/util/makefile.mk 2003-10-21 15:10:35.000000000 +0200
-@@ -105,7 +105,6 @@ SHL1STDLIBS= \
- $(SABLOT3RDLIB) \
- $(EXPATASCII3RDLIB) \
- $(UCBHELPERLIB) \
-- $(BERKELEYLIB) \
- $(BERKELEYCPPLIB)
-
- SHL1LIBS = \
+++ /dev/null
---- desktop/scripts/soffice.sh.orig 2003-09-22 12:07:01.000000000 -0700
-+++ desktop/scripts/soffice.sh 2003-09-22 12:07:47.000000000 -0700
-@@ -144,25 +144,27 @@
- esac
-
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
--java_ld_library_path=`"$sd_prog/javaldx"`
--if [ "$java_ld_library_path" != "" ] ; then
-- case $sd_platform in
-- AIX)
-- LIBPATH=${java_ld_library_path}:${LIBPATH}
-- ;;
-- Darwin)
-- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
-- ;;
-- HP-UX)
-- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
-- ;;
-- IRIX*)
-- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
-- ;;
-- *)
-- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-- ;;
-- esac
-+if [ -x "$sd_prog/javaldx" ] ; then
-+ java_ld_library_path=`"$sd_prog/javaldx"`
-+ if [ "$java_ld_library_path" != "" ] ; then
-+ case $sd_platform in
-+ AIX)
-+ LIBPATH=${java_ld_library_path}:${LIBPATH}
-+ ;;
-+ Darwin)
-+ DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
-+ ;;
-+ HP-UX)
-+ SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
-+ ;;
-+ IRIX*)
-+ LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
-+ ;;
-+ *)
-+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-+ ;;
-+ esac
-+ fi
- fi
-
- # set java environment variables
---- desktop/source/javaldx/makefile.mk.orig 2003-09-22 12:07:12.000000000 -0700
-+++ desktop/source/javaldx/makefile.mk 2003-09-22 12:11:42.000000000 -0700
-@@ -77,6 +77,8 @@
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- OBJFILES=$(OBJ)$/javaldx.obj
-
- APP1TARGET=javaldx
-@@ -86,6 +88,8 @@
- APP1STDLIBS+= -lstdc++
- .ENDIF
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
+++ /dev/null
-# dictionary.lst file contains list of all dictionaries
-# to be loaded by OpenOffice
-# ---------------------------------------------------
-# Each Entry in the list have the following space delimited fields
-#
-# Field 1: Entry Type "DICT" - spellchecking dictionary
-# "HYPH" - hyphenation dictionary
-# "THES" - thesaurus files
-#
-# Field 2: Language code from Locale "en" or "de" or "pt" ...
-#
-# Field 3: Country Code from Locale "US" or "GB" or "PT"
-#
-# Field 4: Root name of file(s) "en_US" or "hyph_de" or "th_en_US
-# (do not add extensions to the name)
+++ /dev/null
---- instsetoo/prj/build.lst.org 2004-03-30 08:40:35.000000000 +0000
-+++ instsetoo/prj/build.lst 2004-03-30 08:41:07.000000000 +0000
-@@ -1,3 +1,3 @@
--oo instsetoo : UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker odk embedserv pyuno crashrep virgule NULL
-+oo instsetoo : UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker embedserv pyuno crashrep virgule NULL
- oo instsetoo usr1 - all oo_mkout NULL
- oo instsetoo\util nmake - all oo_util NULL
+++ /dev/null
-#! /usr/bin/perl
-
-use strict;
-
-#- Define full path to unzip command
-my $UnzipCommand = "/usr/bin/unzip";
-
-#- Define the default setup file
-my $SetupConf = "setup.ins";
-
-#- Define the zipfiles dir (will be the same as of setup.ins)
-my $SetupDir = ".";
-
-#- Define destination directory
-my $DestDir = "/usr/lib/openoffice";
-
-#- Define to extract help files
-my $ExtractHelp = 0;
-
-sub dirname { local $_ = shift; s|[^/]*/*\s*$||; s|(.)/*$|$1|; $_ || '.' }
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray() ? @l : join '', @l }
-
-sub mkdir_p {
- my ($dir) = @_;
- if (-d $dir) {
- # nothing to do
- } elsif (-e $dir) {
- die "mkdir: error creating directory $dir: $dir is a file and i won't delete it\n";
- } else {
- mkdir_p(dirname($dir));
- mkdir($dir, 0755) or die "mkdir: error creating directory $dir: $!\n";
- }
- 1;
-}
-
-while ( $ARGV[0] =~ /^-/ ) {
- $_ = shift;
- if (m/^-d=(\S+)/) {
- $DestDir=$1;
- }
- elsif (m/^-z=(\S+)/) {
- $UnzipCommand=$1;
- }
- elsif (m/^-i=(\S+)/) {
- $SetupConf=$1;
- $SetupDir=dirname $SetupConf;
- }
- elsif (m/^-h/) {
- $ExtractHelp = 1;
- }
- else {
- print STDERR "$0: Unknown option $_";
- }
-}
-
-# Parse enough of <setup.ins> to get correct Directory and File sections.
-sub ReadSetup($) {
- my ($file) = @_;
- my $e;
- my %entries;
- foreach (cat_("$file")) {
- if (/^([_A-Za-z]+)\s*([_A-Za-z0-9]+)/) {
- $entries{$1}{$2} = $e = { };
- }
- elsif (/\s*([_A-Za-z]+)\s*=\s*\"?([^;\"]+)\"?;/) {
- $e->{$1} = $2;
- }
- }
-
- # Expand predefined dirs to de $DestDir variable
- $entries{Directory}{$_} = { HostName => "$DestDir" } foreach
- qw( PREDEFINED_HOMEDIR PREDEFINED_PROGDIR PREDEFINED_CONFIGDIR );
-
- \%entries;
-}
-
-sub DumpEntries(\%$) {
- my $entries = shift;
- my ($basename) = @_;
- my $sections = $entries->{$basename} if $entries->{$basename};
- while (my ($key, $value) = each(%$sections)) {
- print "$basename $key\n";
- $value->{$_} and print "\t$_\t= \"$value->{$_}\";\n"
- foreach qw(Bitmap Date DefaultDestPath DefaultLanguage
- Description FadeType FileName fontsDirFile
- fontsDirGlobalFile fontspath HostName ID Key
- Languages Name PackedName Path ProcName
- ProductName ProductVersion Section Text Time
- Value VendorBitmap);
- $value->{$_} and print "\t$_\t= $value->{$_};\n"
- foreach qw(ArchiveFiles ArchiveSize BitmapPosX BitmapPoxY
- Carrier Default Dir DiskNo FileID FontSize
- Minimal ModuleID NetDir Order ParentID
- ProfileID RegistryID ScriptVersion Size
- TextHeight TextWidth UnixRights);
- print "End\n\n";
- }
-}
-
-sub GetFullPath {
- my $dirs = shift;
- my ($id) = @_;
- return ( $dirs->{$id}->{ParentID} ? GetFullPath($dirs, $dirs->{$id}->{ParentID}) . "/" : "" )
- . $dirs->{$id}->{HostName};
-}
-
-# Parse the file and get all entries
-die "$0: Can't open $SetupConf\n" if ( ! -r $SetupConf );
-my $setup = ReadSetup($SetupConf);
-#DumpEntries %$setup, "Directory";
-#DumpEntries %$setup, "File";
-
-die "$UnzipCommand not found, please set the full path to the unzip command\n" if
- ( ! -x "$UnzipCommand" );
-
-while (my ($key, $value) = each (%{$setup->{File}})) {
- if ($value->{PackedName}) {
- my $zipfile = "$SetupDir/$value->{PackedName}";
- die "$0: zip file $zipfile not accessible" if
- ( ! -r "$zipfile" );
-
- # Find language-specific candidates
- if ($key =~ /_Lang$/ || $value->{Name} =~ /\.res$/
- || ($ExtractHelp && $key =~ /File_Help/ && $value->{Dir} =~ /gid_Dir_Help_Isolanguage/)) {
- print "Unpacking $zipfile... ";
- # Prefer NetDir path over simple Dir
- my $outpath = GetFullPath \%{$setup->{Directory}}, $value->{NetDir} ? $value->{NetDir} : $value->{Dir};
- -d $outpath or mkdir_p($outpath);
- system("$UnzipCommand $zipfile -d $outpath");
- }
- }
-}
-
+++ /dev/null
---- oo/eventattacher/source/eventattacher.cxx.orig Fri May 23 17:47:18 2003
-+++ oo/eventattacher/source/eventattacher.cxx Fri May 23 17:47:31 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -925,7 +925,7 @@
- reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLNAME "/UNO/SERVICES") )));
-
-- Sequence< OUString > & rSNL =
-+ const Sequence< OUString > & rSNL =
- ::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static();
- const OUString * pArray = rSNL.getConstArray();
- for ( sal_Int32 nPos = rSNL.getLength(); nPos--; )
+++ /dev/null
---- officecfg/registry/data/org/openoffice/Office/Common.xcu
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu
-@@ -107,13 +107,13 @@
- </node>
- <node oor:name="ExternalApps">
- <prop oor:name="http" oor:op="replace" oor:type="xs:string">
-- <value/>
-+ <value>mozilla</value>
- </prop>
- <prop oor:name="https" oor:op="replace" oor:type="xs:string">
-- <value/>
-+ <value>mozilla</value>
- </prop>
- <prop oor:name="ftp" oor:op="replace" oor:type="xs:string">
-- <value/>
-+ <value>mozilla</value>
- </prop>
- <prop oor:name="file" oor:op="replace" oor:type="xs:string">
- <value/>
+++ /dev/null
---- oo_1.0.2_src/dmake/unix/runargv.c.fix-errno 2003-01-07 09:32:42.000000000 -0500
-+++ oo_1.0.2_src/dmake/unix/runargv.c 2003-01-24 15:38:58.000000000 -0500
-@@ -29,6 +29,9 @@
- #if defined(__CYGWIN__)
- #include <errno.h>
- #endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-
- typedef struct prp {
- char *prp_cmd;
-@@ -71,7 +74,9 @@ int shell;
- char *cmd;
- {
- #if !defined(__CYGWIN__)
-+#if !HAVE_ERRNO_H
- extern int errno;
-+#endif
- #ifndef __APPLE__
- #ifdef arm32
- extern const char * const sys_errlist[];
---- oo_1.0.2_src/unzip/inc/unzip.h.fix-errno 2003-01-25 01:13:19.000000000 -0500
-+++ oo_1.0.2_src/unzip/inc/unzip.h 2003-01-25 01:22:43.000000000 -0500
-@@ -134,8 +134,8 @@
- #endif
- #include <ctype.h> /* skip for VMS, to use tolower() function? */
- #include <errno.h> /* used in mapname() */
--#ifndef NO_ERRNO
--# define DECLARE_ERRNO /* everybody except MSC 6.0, SCO cc, Watcom C/386 */
-+#if !defined(NO_ERRNO) && !defined(__GLIBC__)
-+# define DECLARE_ERRNO /* everybody except MSC 6.0, SCO cc, Watcom C/386, glibc systems */
- #endif /* !NO_ERRNO */
- #ifdef VMS
- # include <types.h> /* (placed up here instead of in VMS section below */
+++ /dev/null
-# Patch updates build.pl to revision 1.93 which allows parallel builds to occur
-
---- oo_1.1_src/solenv/bin/build.pl.fix-parallel-build 2003-06-24 07:31:50.000000000 -0400
-+++ oo_1.1_src/solenv/bin/build.pl 2003-10-24 09:42:46.000000000 -0400
-@@ -1,13 +1,13 @@
--:
--eval 'exec perl -S $0 ${1+"$@"}'
-- if 0;
-+ :
-+ eval 'exec perl -S $0 ${1+"$@"}'
-+ if 0;
- #*************************************************************************
- #
- # $RCSfile$
- #
--# $Revision$
-+# $Revision$
- #
--# last change: $Author$ $Date$
-+# last change: $Author$ $Date$
- #
- # The Contents of this file are made available subject to the terms of
- # either of the following licenses
-@@ -67,28 +67,28 @@
- # build - build entire project
- #
-
--use Config;
--use POSIX;
--use Cwd;
--use File::Path;
-+ use Config;
-+ use POSIX;
-+ use Cwd;
-+ use File::Path;
- #use Thread 'yield'; # Should be uncommented if you have Thread.pm (untested)
--
--if (defined $ENV{CWS_WORK_STAMP}) {
-- require lib; import lib ("$ENV{SOLARENV}/bin/modules", "$ENV{COMMON_ENV_TOOLS}/modules");
-- require Cws; import Cws;
-- require CvsModule; import CvsModule;
-- require GenInfoParser; import GenInfoParser;
--};
-+
-+ if (defined $ENV{CWS_WORK_STAMP}) {
-+ require lib; import lib ("$ENV{SOLARENV}/bin/modules", "$ENV{COMMON_ENV_TOOLS}/modules");
-+ require Cws; import Cws;
-+ require CvsModule; import CvsModule;
-+ require GenInfoParser; import GenInfoParser;
-+ };
-
- #### script id #####
-
--( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-+ ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
--$id_str = ' $Revision$ ';
--$id_str =~ /Revision:\s+(\S+)\s+\$/
-- ? ($script_rev = $1) : ($script_rev = "-");
-+ $id_str = ' $Revision$ ';
-+ $id_str =~ /Revision:\s+(\S+)\s+\$/
-+ ? ($script_rev = $1) : ($script_rev = "-");
-
--print "$script_name -- version: $script_rev\n";
-+ print "$script_name -- version: $script_rev\n";
-
- #########################
- # #
-@@ -96,135 +96,142 @@
- # #
- #########################
-
--$perl = "";
--$remove_commando = "";
--if ( $^O eq 'MSWin32' ) {
-- $perl = "$ENV{COMSPEC} -c perl5";
-- $remove_commando = "rmdir /S /Q";
-- $nul = '> NULL';
--} else {
-- use Cwd 'chdir';
-- $perl = 'perl';
-- $remove_commando = 'rm -rf';
-- $nul = '> /dev/null';
--};
-+ $perl = "";
-+ $remove_commando = "";
-+ if ( $^O eq 'MSWin32' ) {
-+ $perl = "$ENV{COMSPEC} -c perl5";
-+ $remove_commando = "rmdir /S /Q";
-+ $nul = '> NULL';
-+ } else {
-+ use Cwd 'chdir';
-+ $perl = 'perl';
-+ $remove_commando = 'rm -rf';
-+ $nul = '> /dev/null';
-+ };
-
--$QuantityToBuild = 0;
-+ $QuantityToBuild = 0;
- # delete $pid when not needed
--%projects_deps_hash = (); # hash of undependent projects,
-- # that could be built now
--%broken_build = (); # hash of hashes of the modules,
-- # where build was broken (error occurred)
--%folders_hashes = ();
--%running_children = ();
--$dependencies_hash = 0;
--$handler_set = 0;
--$cmd_file = '';
--$BuildAllParents = 0;
--$show = 0;
--$deliver = 0;
--%LocalDepsHash = ();
--%BuildQueue = ();
--%PathHash = ();
--%PlatformHash = ();
--%AliveDependencies = ();
--%ParentDepsHash = (); # hash of dependencies of the current project
--@UnresolvedParents = ();
--@dmake_args = ();
--%DeadParents = ();
--$CurrentPrj = '';
--$no_projects = 0;
--$only_dependent = 0;
--$build_from = '';
--$build_from_opt = '';
--$build_since = '';
--$dlv_switch = '';
--$child = 0;
--%processes_hash = ();
--%module_annonced = ();
--$locked = 0; # lock for signal handler
--$prepare = ''; # prepare for following incompartible build
--$ignore = '';
--@ignored_errors = ();
--%incompartibles = ();
--%force_deliver = ();
--
--&get_options;
--%deliver_env = ();
--if ($prepare) {
-- %platforms = &get_platforms;
-- @modules_built = ();
--
-- $deliver_env{'BUILD_SOSL'}++;
-- $deliver_env{'COMMON_OUTDIR'}++;
-- $deliver_env{'DLLSUFFIX'}++;
-- $deliver_env{'GUI'}++;
-- $deliver_env{'INPATH'}++;
-- $deliver_env{'OFFENV_PATH'}++;
-- $deliver_env{'OUTPATH'}++;
-- $deliver_env{'L10N_framework'}++;
--};
--
--$StandDir = &get_stand_dir();
--&provide_consistency if (defined $ENV{CWS_WORK_STAMP});
--
--$deliver_commando = $ENV{DELIVER};
--$deliver_commando .= ' '. $dlv_switch if ($dlv_switch);
--$ENV{mk_tmp}++;
--%prj_platform = ();
--$check_error_string = '';
--$dmake = '';
--$echo = '';
--$new_line = "\n";
-+ %projects_deps_hash = (); # hash of undependent projects,
-+ # that could be built now
-+ %broken_build = (); # hash of hashes of the modules,
-+ # where build was broken (error occurred)
-+ %folders_hashes = ();
-+ %running_children = ();
-+ $dependencies_hash = 0;
-+ $cmd_file = '';
-+ $BuildAllParents = 0;
-+ $show = 0;
-+ $deliver = 0;
-+ %LocalDepsHash = ();
-+ %BuildQueue = ();
-+ %PathHash = ();
-+ %PlatformHash = ();
-+ %AliveDependencies = ();
-+ %global_deps_hash = (); # hash of dependencies of the all modules
-+ %broken_modules_hashes = (); # hash of modules hashes, which cannot be built further
-+ @broken_modules_names = (); # array of modules, which cannot be built further
-+ @UnresolvedParents = ();
-+ @dmake_args = ();
-+ %DeadParents = ();
-+ $CurrentPrj = '';
-+ $no_projects = 0;
-+ $only_dependent = 0;
-+ $build_from = '';
-+ $build_from_opt = '';
-+ $build_since = '';
-+ $dlv_switch = '';
-+ $child = 0;
-+ %processes_hash = ();
-+ %module_annonced = ();
-+ $prepare = ''; # prepare for following incompartible build
-+ $ignore = '';
-+ @ignored_errors = ();
-+ %incompartibles = ();
-+ %force_deliver = ();
-+ $only_platform = ''; # the only platform to prepare
-+ $only_common = ''; # the only common output tree to delete when preparing
-+ %build_modes = ();
-+ $maximal_processes = 0; # the max number of the processes run
-+
-+### main ###
-+
-+ &get_options;
-+ &get_build_modes;
-+ %deliver_env = ();
-+ if ($prepare) {
-+ %platforms = &get_platforms;
-+ @modules_built = ();
-+
-+ $deliver_env{'BUILD_SOSL'}++;
-+ $deliver_env{'COMMON_OUTDIR'}++;
-+ $deliver_env{'DLLSUFFIX'}++;
-+ $deliver_env{'GUI'}++;
-+ $deliver_env{'INPATH'}++;
-+ $deliver_env{'OFFENV_PATH'}++;
-+ $deliver_env{'OUTPATH'}++;
-+ $deliver_env{'L10N_framework'}++;
-+ };
-+
-+ $StandDir = &get_stand_dir();
-+ &provide_consistency if (defined $ENV{CWS_WORK_STAMP});
-+
-+ $deliver_commando = $ENV{DELIVER};
-+ $deliver_commando .= ' '. $dlv_switch if ($dlv_switch);
-+ $ENV{mk_tmp}++;
-+ %prj_platform = ();
-+ $check_error_string = '';
-+ $dmake = '';
-+ $echo = '';
-+ $new_line = "\n";
- #### main ####
-
--&get_commands();
--unlink ($cmd_file);
--if ($cmd_file) {
-- if (open (CMD_FILE, ">>$cmd_file")) {
-- select CMD_FILE;
-- $echo = 'echo ';
-- $new_line = $echo."\"\"\n";
-- print "\@$echo off\npushd\n" if ($ENV{GUI} ne 'UNX');
-- } else {
-- &print_error ("Cannot open file $cmd_file");
-- };
--} elsif ($show) {
-- select STDERR;
--};
-+ &get_commands();
-+ unlink ($cmd_file);
-+ if ($cmd_file) {
-+ if (open (CMD_FILE, ">>$cmd_file")) {
-+ select CMD_FILE;
-+ $echo = 'echo ';
-+ $new_line = $echo."\"\"\n";
-+ print "\@$echo off\npushd\n" if ($ENV{GUI} ne 'UNX');
-+ } else {
-+ &print_error ("Cannot open file $cmd_file");
-+ };
-+ } elsif ($show) {
-+ select STDERR;
-+ };
-
--print $new_line;
-+ print $new_line;
-
--&BuildAll();
--&cancel_build if (scalar keys %broken_build);
--@TotenEltern = keys %DeadParents;
--if ($#TotenEltern != -1) {
-- my ($DeadPrj);
-- print $new_line.$new_line;
-- print $echo."WARNING! Project(s):\n";
-- foreach $DeadPrj (@TotenEltern) {
-- print $echo."$DeadPrj\n";
-- };
-- print $new_line;
-- print $echo."not found and couldn't be built. Correct build.lsts.\n";
-- print $new_line;
--};
--if (($ENV{GUI} ne 'UNX') && $cmd_file) {
-- print "popd\n";
--};
--$ENV{mk_tmp} = '';
--if ($cmd_file) {
-- close CMD_FILE;
-- print STDOUT "Script $cmd_file generated\n";
--};
--exit(0) if (!$ignore);
--exit(0) if (!scalar @ignored_errors);
--print STDERR "\nERROR: next directories could not be built:\n";
--foreach (@ignored_errors) {
-- print STDERR "\t$_\n";
--};
--print STDERR "\nERROR: please check these directories and build the correspondent module(s) anew!!\n\n";
--exit(1);
-+ &BuildAll();
-+ &cancel_build if (scalar keys %broken_build);
-+ @TotenEltern = keys %DeadParents;
-+ if ($#TotenEltern != -1) {
-+ my ($DeadPrj);
-+ print $new_line.$new_line;
-+ print $echo."WARNING! Project(s):\n";
-+ foreach $DeadPrj (@TotenEltern) {
-+ print $echo."$DeadPrj\n";
-+ };
-+ print $new_line;
-+ print $echo."not found and couldn't be built. Correct build.lsts.\n";
-+ print $new_line;
-+ };
-+ if (($ENV{GUI} ne 'UNX') && $cmd_file) {
-+ print "popd\n";
-+ };
-+ $ENV{mk_tmp} = '';
-+ if ($cmd_file) {
-+ close CMD_FILE;
-+ print STDOUT "Script $cmd_file generated\n";
-+ };
-+ exit(0) if (!$ignore);
-+ exit(0) if (!scalar @ignored_errors);
-+ print STDERR "\nERROR: next directories could not be built:\n";
-+ foreach (@ignored_errors) {
-+ print STDERR "\t$_\n";
-+ };
-+ print STDERR "\nERROR: please check these directories and build the correspondent module(s) anew!!\n\n";
-+ exit(1);
-
-
- #########################
-@@ -236,73 +243,73 @@
- #
- # Get dependencies hash of the current and all parent projects
- #
--sub GetParentDeps {
-- my ($ParentsString, @DepsArray, $Prj, $parent, $prj_link);
-- my $prj_dir = shift;
-- my $deps_hash = shift;
-- $ParentsString = &GetParentsString($prj_dir);
-- @DepsArray = &GetDependenciesArray($ParentsString);
-- @UnresolvedParents = @DepsArray;
-- $$deps_hash{$prj_dir} = [@DepsArray];
-- while ($Prj = pop(@UnresolvedParents)) {
-- $prj_link = $Prj . '.lnk';
-- if (!-d $StandDir.$Prj) {
-- if (-e $StandDir.$prj_link) {
-- $Prj = $prj_link;
-- } elsif (-l $StandDir.$prj_link) {
-- &print_error("There is no target for link $StandDir$prj_link");
-+ sub GetParentDeps {
-+ my ($ParentsString, @DepsArray, $Prj, $parent, $prj_link);
-+ my $prj_dir = shift;
-+ my $deps_hash = shift;
-+ $ParentsString = &GetParentsString($prj_dir);
-+ @DepsArray = &GetDependenciesArray($ParentsString);
-+ @UnresolvedParents = @DepsArray;
-+ $$deps_hash{$prj_dir} = [@DepsArray];
-+ while ($Prj = pop(@UnresolvedParents)) {
-+ $prj_link = $Prj . '.lnk';
-+ if (!-d $StandDir.$Prj) {
-+ if (-e $StandDir.$prj_link) {
-+ $Prj = $prj_link;
-+ } elsif (-l $StandDir.$prj_link) {
-+ &print_error("There is no target for link $StandDir$prj_link");
-+ } elsif (defined $ENV{CWS_WORK_STAMP}) {
-+ &checkout_module($Prj, 'image');
-+ };
- } elsif (defined $ENV{CWS_WORK_STAMP}) {
-- &checkout_module($Prj, 'image');
-+ &check_module_consistency($Prj);
- };
-- } elsif (defined $ENV{CWS_WORK_STAMP}) {
-- &check_module_consistency($Prj);
-- };
-- my @DepsArray;
-- if (!($ParentsString = &GetParentsString($StandDir.$Prj))) {
-- $DeadParents{$Prj}++;
-- $$deps_hash{$Prj} = [];
-- next;
-- };
-- @DepsArray = &GetDependenciesArray($ParentsString, $Prj);
-- $$deps_hash{$Prj} = [@DepsArray];
-- foreach $Parent (@DepsArray) {
-- if ((!defined($$deps_hash{$Parent})) && (!defined($$deps_hash{$Parent . '.lnk'}))) {
-- push (@UnresolvedParents, $Parent);
-- };
-- };
-- };
-- foreach $parent (keys %DeadParents) {
-- delete $ParentDepsHash{$parent};
-- &RemoveFromDependencies($parent, $deps_hash);
-- };
--};
-+ my @DepsArray;
-+ if (!($ParentsString = &GetParentsString($StandDir.$Prj))) {
-+ $DeadParents{$Prj}++;
-+ $$deps_hash{$Prj} = [];
-+ next;
-+ };
-+ @DepsArray = &GetDependenciesArray($ParentsString, $Prj);
-+ $$deps_hash{$Prj} = [@DepsArray];
-+ foreach $Parent (@DepsArray) {
-+ if ((!defined($$deps_hash{$Parent})) && (!defined($$deps_hash{$Parent . '.lnk'}))) {
-+ push (@UnresolvedParents, $Parent);
-+ };
-+ };
-+ };
-+ foreach $parent (keys %DeadParents) {
-+ delete $global_deps_hash{$parent};
-+ &RemoveFromDependencies($parent, $deps_hash);
-+ };
-+ };
-
- #
- # Build everything that should be built
- #
--sub BuildAll {
-- if ($BuildAllParents) {
-- my ($Prj, $PrjDir, $orig_prj);
-- &GetParentDeps( $CurrentPrj, \%ParentDepsHash);
-- &prepare_build_from(\%ParentDepsHash) if ($build_from);
-- &prepare_incompartible_build(\%ParentDepsHash) if ($incompartible);
-- if ($build_from_opt || $build_since) {
-- &prepare_build_from_opt(\%ParentDepsHash);
-- };
-- if ($QuantityToBuild) {
-- &build_multiprocessing;
-- return;
-- };
-- while ($Prj = &PickPrjToBuild(\%ParentDepsHash)) {
-- print $new_line;
-- my $module_type = &module_classify($Prj);
--
-- &print_annonce($Prj) if ($module_type eq 'lnk');
-+ sub BuildAll {
-+ if ($BuildAllParents) {
-+ my ($Prj, $PrjDir, $orig_prj);
-+ &GetParentDeps( $CurrentPrj, \%global_deps_hash);
-+ &prepare_build_from(\%global_deps_hash) if ($build_from);
-+ &prepare_incompartible_build(\%global_deps_hash) if ($incompartible);
-+ if ($build_from_opt || $build_since) {
-+ &prepare_build_from_opt(\%global_deps_hash);
-+ };
-+ if ($QuantityToBuild) {
-+ &build_multiprocessing;
-+ return;
-+ };
-+ while ($Prj = &PickPrjToBuild(\%global_deps_hash)) {
-+ print $new_line;
-+ my $module_type = &module_classify($Prj);
-+
-+ &print_annonce($Prj) if ($module_type eq 'lnk');
- &print_annonce($Prj . '.incomp') if ($module_type eq 'img');
- if ($module_type eq 'mod') {
- if (scalar keys %broken_build) {
- print $echo. "Skipping project $Prj because of error(s)\n";
-- &RemoveFromDependencies($Prj, \%ParentDepsHash);
-+ &RemoveFromDependencies($Prj, \%global_deps_hash);
- next;
- };
- &print_annonce($Prj);
-@@ -318,7 +325,7 @@
- };
- print $check_error_string;
- };
-- &RemoveFromDependencies($Prj, \%ParentDepsHash);
-+ &RemoveFromDependencies($Prj, \%global_deps_hash);
- $no_projects = 0;
- };
- } else {
-@@ -367,26 +374,19 @@
- if (!$cmd_file && !$show) {
- chdir $BuildDir;
- cwd();
-- $error_code = system ("$dmake") if (!scalar keys %broken_build);
-+ $error_code = system ("$dmake");
- if ($error_code && $ignore) {
- push(@ignored_errors, &CorrectPath($StandDir . $PathHash{$folder_nick}));
- $error_code = 0;
- };
-- if ($error_code && ($error_code != -1)) {
-- if (!$child) {
-- if ($incompartible) {
-- $broken_build{$error_code} = &CorrectPath($StandDir . $PathHash{$folder_nick});
-- } else {
-- &print_error("Error $? occurred while making $BuildDir");
-- };
-- };
-- };
- };
- if ($child) {
- my $oldfh = select STDERR;
- $| = 1;
- _exit($? >> 8) if ($? && ($? != -1));
- _exit(0);
-+ } elsif ($error_code && ($error_code != -1)) {
-+ &print_error("Error $? occurred while making $BuildDir");
- };
- };
-
-@@ -409,7 +409,7 @@
- s/\r\n//;
- if ($_ =~ /\:+\s+/) {
- close BUILD_LST;
-- return $';
-+ return &pick_for_build_type($');
- };
- };
- close BUILD_LST;
-@@ -460,7 +460,7 @@
- open (BUILD_LST, 'prj/build.lst');
- &get_prj_platform;
- while (<BUILD_LST>) {
-- if ($_ =~ /#/) {
-+ if ($_ =~ /#/o) {
- if ($`) {
- $_ = $`;
- } else {
-@@ -468,19 +468,19 @@
- };
- };
- s/\r\n//;
-- if ($_ =~ /nmake/) {
-+ if ($_ =~ /nmake/o) {
- my ($Platform, $Dependencies, $Dir, $DirAlias, @Array);
- $Dependencies = $';
- $dummy = $`;
-- $dummy =~ /(\S+)\s+(\S+)/;
-+ $dummy =~ /(\S+)\s+(\S+)/o;
- $Dir = $2;
-- $Dependencies =~ /(\w+)/;
-+ $Dependencies =~ /(\w+)/o;
- $Platform = $1;
- $Dependencies = $';
-- while ($Dependencies =~ /,(\w+)/) {
-+ while ($Dependencies =~ /,(\w+)/o) {
- $Dependencies = $';
- };
-- $Dependencies =~ /\s+(\S+)\s+/;
-+ $Dependencies =~ /\s+(\S+)\s+/o;
- $DirAlias = $1;
- if (!&CheckPlatform($Platform)) {
- $DeadDependencies{$DirAlias}++;
-@@ -488,6 +488,7 @@
- };
- $PlatformHash{$DirAlias}++;
- $Dependencies = $';
-+ &print_error("$PrjToBuild/prj/build.lst has wrong written dependencies string:\n$_\n") if (!$Dependencies);
- @Array = &GetDependenciesArray($Dependencies);
- $$dependencies_hash{$DirAlias} = [@Array];
- $BuildQueue{$DirAlias}++;
-@@ -614,8 +615,9 @@
- sub PickPrjToBuild {
- my ($Prj, $DepsHash);
- $DepsHash = shift;
-+ &handle_dead_children if ($QuantityToBuild);
- $Prj = &FindIndepPrj($DepsHash);
-- delete $$DepsHash{$Prj};# if (defined $$DepsHash{$Prj});
-+ delete $$DepsHash{$Prj};
- return $Prj;
- };
-
-@@ -672,12 +674,12 @@
- return $Prj if ($#PrjDeps == -1);
- };
- # If there are only dependent projects in hash - generate error
-- return '' if ($BuildAllParents);
-+ return '' if ($BuildAllParents && !$children);
- if ($children) {
- $only_dependent = 1;
- return '';
- };
-- print STDERR "\nError: projects";
-+ print STDERR "\nFatal error:";
- foreach $Prj (keys %$Dependencies) {
- if (&IsHashNative($Prj)) {
- next;
-@@ -713,12 +715,12 @@
- $DepString = shift;
- $string = $DepString;
- $prj = shift;
-- while (!($DepString =~ /^NULL/)) {
-+ while ($DepString !~ /^NULL/o) {
- &print_error("Project $prj has wrong written dependencies string:\n $string") if (!$DepString);
-- $DepString =~ /(\S+)\s*/;
-+ $DepString =~ /(\S+)\s*/o;
- $ParentPrj = $1;
- $DepString = $';
-- if ($ParentPrj =~ /\.(\w+)$/) {
-+ if ($ParentPrj =~ /\.(\w+)$/o) {
- $ParentPrj = $`;
- if (($prj_platform{$ParentPrj} ne $1) &&
- ($prj_platform{$ParentPrj} ne 'all')) {
-@@ -761,14 +763,15 @@
-
- sub usage {
- print STDERR "\nbuild\n";
-- print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p]] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [-- dmake_options] \n";
-+ print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform]] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [-- dmake_options] \n";
- print STDERR "Example: build --from sfx2\n";
- print STDERR " - build projects including current one from sfx2\n";
- print STDERR "Example: build --all:sfx2\n";
- print STDERR " - the same as --all, but skip all projects that have been already built when using \"--all\" switch before sfx2\n";
- print STDERR "Keys: --all - build all projects from very beginning till current one\n";
- print STDERR " --from - build all projects dependent from the specified (including it) till current one\n";
-- print STDERR " --prepare- clear all projects for incompartible build from prj_name till current one (cws version)\n";
-+ print STDERR " --mode OOo - build only projects needed for OpenOffice.org\n";
-+ print STDERR " --prepare- clear all projects for incompartible build from prj_name till current one [for platform] (cws version)\n";
- print STDERR " --with_branches- build all projects in neighbour branches and current branch starting from actual project\n";
- print STDERR " --since - build all projects beginning from the specified till current one (the same as \"--all:prj_name\", but skipping prj_name)\n";
- print STDERR " --show - show what is going to be built\n";
-@@ -816,6 +819,8 @@
- };
- $arg =~ /^--prepare$/ and $prepare = 1 and next;
- $arg =~ /^-p$/ and $prepare = 1 and next;
-+ $arg =~ /^--prepare:/ and $prepare = 1 and $only_platform = $' and next;
-+ $arg =~ /^-p:/ and $prepare = 1 and $only_platform = $' and next;
- $arg =~ /^--since$/ and $BuildAllParents = 1
- and $build_since = shift @ARGV and next;
- $arg =~ /^-c$/ and $BuildAllParents = 1
-@@ -828,6 +833,8 @@
- $arg =~ /^-i$/ and $ignore = 1 and next;
- $arg =~ /^--version$/ and exit(0);
- $arg =~ /^-V$/ and exit(0);
-+ $arg =~ /^-m$/ and &get_modes and next;
-+ $arg =~ /^--mode$/ and &get_modes and next;
- if ($arg =~ /^--$/) {
- &get_dmake_args;
- next;
-@@ -854,6 +861,10 @@
- # print "Ignored...";
- # $incompartible = '';
- # };
-+ if ($only_platform) {
-+ $only_common = 'common';
-+ $only_common .= '.pro' if ($only_platform =~ /\.pro$/);
-+ };
- @ARGV = @dmake_args;
- };
-
-@@ -888,11 +899,23 @@
- # cancel build when one of children has error exit code
- #
- sub cancel_build {
-+ if ($BuildAllParents) {
-+ print STDERR "\n";
-+ print STDERR scalar @broken_modules_names;
-+ print STDERR " module(s): ";
-+ foreach (@broken_modules_names) {
-+ print STDERR "\n\t$_";
-+ &RemoveFromDependencies($_, \%global_deps_hash);
-+ };
-+ print STDERR "\nneed(s) to be rebuilt\n\nReason(s):\n\n";
-+ foreach (keys %broken_build) {
-+ print STDERR "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
-+ };
-+ print STDERR "\nAttention: if you build and deliver the above module(s) you may prolongue your build from module " . &PickPrjToBuild(\%global_deps_hash) . "\n";
-+ } else {
-+ kill 9 => -$$;
-+ };
- print STDERR "\n";
-- foreach (keys %broken_build) {
-- print STDERR "ERROR: error $_ occurred while making ", $broken_build{$_}, "\n";
-- };
-- kill 9 => -$$ if (!$BuildAllParents);
- exit(1);
- };
-
-@@ -902,22 +925,23 @@
- sub store_error {
- my ($pid, $error_code) = @_;
- my $child_nick = $processes_hash{$pid};
-- $broken_build {$error_code} = &CorrectPath($StandDir . $PathHash{$child_nick});
-+ $broken_modules_hashes{$folders_hashes{$child_nick}}++;
-+ $broken_build{&CorrectPath($StandDir . $PathHash{$child_nick})} = $error_code;
- &cancel_build if (!$BuildAllParents);
- };
-
- #
- # child handler (clears (or stores info about) the terminated child)
- #
--sub handle_dead_child {
-- lock $locked;
--# yield; # Should be uncommented if you have Thread.pm (untested)
-+sub handle_dead_children {
- my $pid = 0;
-- foreach (keys %processes_hash) {
-- if (($pid = waitpid($_, &WNOHANG)) > 0) {
-- &store_error($pid, $?) if ($?);
-- &clear_from_child($pid);
-- };
-+ if (($pid = waitpid( -1, &WNOHANG)) > 0) {
-+ &store_error($pid, $?) if ($?);
-+ &clear_from_child($pid);
-+ };
-+ while(&children_number() >= $QuantityToBuild) {
-+ sleep 1;
-+ &handle_dead_children;
- };
- };
-
-@@ -932,41 +956,31 @@
- };
-
- #
--# Register signal handler & unblock SIGALRM
--#
--sub register_signal_handler {
-- $sigaction = POSIX::SigAction->new('main::handle_dead_child');
-- sigaction(SIGCHLD, $sigaction);
-- $handler_set = 1;
--};
--
--#
- # Build the entire project according to queue of dependencies
- #
- sub BuildDependent {
- $dependencies_hash = shift;
- my $pid = 0;
- my $child_nick = '';
-+ $running_children{$dependencies_hash} = 0 if (!defined $running_children{$dependencies_hash});
- while ($child_nick = &PickPrjToBuild($dependencies_hash)) {
-- if (($QuantityToBuild) ) { # multyprocessing not for $BuildAllParents (-all etc)!!
-- ®ister_signal_handler if (!$handler_set);
-+ if (($QuantityToBuild)) { # multyprocessing not for $BuildAllParents (-all etc)!!
- do {
-+ &handle_dead_children;
-+ return if (defined $broken_modules_hashes{$dependencies_hash});
- # start current child & all
- # that could be started now
-- &start_child($child_nick) if ($child_nick);
-- sleep if (&children_number() >= $QuantityToBuild);
-+ &start_child($child_nick) if ($child_nick);
- $child_nick = &PickPrjToBuild($dependencies_hash);
- while ($only_dependent) {
- return if ($BuildAllParents);
-- sleep;
-+ sleep 1;
- $child_nick = &PickPrjToBuild($dependencies_hash);
- };
- } while (!$no_projects);
- return if ($BuildAllParents);
-- while (&children_number()) {
-- sleep(5);
-- };
-- print STDERR "Multiprocessing build is finished\n";
-+ &handle_dead_children while (&children_number());
-+ &mp_success_exit;
- } else {
- &dmake_dir($child_nick);
- };
-@@ -975,21 +989,29 @@
- };
-
- sub children_number {
-- return scalar (keys %processes_hash);
-+ return scalar keys %processes_hash;
- };
-
- sub start_child {
- my $child_nick = shift;
- my $pid;
-+ my $children_running;
-+ my $oldfh = select STDOUT;
-+ $| = 1;
- if ($pid = fork) { # parent
-+ select $oldfh;
- $processes_hash{$pid} = $child_nick;
-- print 'Running processes: ', &children_number(), "\n";
-+ $children_running = &children_number;
-+ print 'Running processes: ', $children_running, "\n";
-+ $maximal_processes = $children_running if ($children_running > $maximal_processes);
- $folders_hashes{$child_nick} = $dependencies_hash;
- $running_children{$dependencies_hash}++;
-- sleep(1) if ($BuildAllParents);
-+# sleep(1) if ($BuildAllParents);
- } elsif (defined $pid) { # child
-+ select $oldfh;
- $child = 1;
- &dmake_dir($child_nick);
-+ exit(1);
- };
- };
-
-@@ -1001,31 +1023,44 @@
- my @build_queue = (); # array, containing queue of projects
- # to build
- do {
-- while ($Prj = &PickPrjToBuild(\%ParentDepsHash)) {
-+ while ($Prj = &PickPrjToBuild(\%global_deps_hash)) {
- my $module_type = &module_classify($Prj);
-
- if ($module_type eq 'lnk') {
- &print_annonce($Prj);
-- &RemoveFromDependencies($Prj, \%ParentDepsHash);
-+ &RemoveFromDependencies($Prj, \%global_deps_hash);
- next;
- };
-
- if ($module_type eq 'img') {
- &print_annonce($Prj . '.incomp');
-- &RemoveFromDependencies($Prj, \%ParentDepsHash);
-+ &RemoveFromDependencies($Prj, \%global_deps_hash);
- next;
- }
-+ &mark_force_deliver($Prj, &CorrectPath($StandDir.$Prj)) if (defined $ENV{CWS_WORK_STAMP});
- push @build_queue, $Prj;
- $projects_deps_hash{$Prj} = {};
- &get_deps_hash(&CorrectPath($StandDir.$Prj), $projects_deps_hash{$Prj});
- };
- sleep(1) if (!$Prj);
- &build_actual_queue(\@build_queue);
-- } while (scalar (keys %ParentDepsHash));
-+ if (scalar keys %broken_modules_hashes) {
-+ do {
-+ sleep(1);
-+ &handle_dead_children;
-+ &build_actual_queue(\@build_queue);
-+ } while (&children_number());
-+ &cancel_build;
-+ };
-+ } while (scalar (keys %global_deps_hash));
- # Let all children finish their work
-- sleep(1) while (&children_number());
- &cancel_build if (scalar keys %broken_build);
-- print STDERR "Multiprocessing build is finished\n";
-+ &mp_success_exit;
-+};
-+
-+sub mp_success_exit {
-+ print STDERR "\nMultiprocessing build is finished\n";
-+ print STDERR "Maximal number of processes run: $maximal_processes\n";
- exit(0);
- };
-
-@@ -1038,19 +1073,27 @@
- do {
- while ($i <= (scalar(@$build_queue) - 1)) {
- $Prj = $$build_queue[$i];
-+ if (defined $broken_modules_hashes{$projects_deps_hash{$Prj}}) {
-+ push (@broken_modules_names, $Prj);
-+ splice (@$build_queue, $i, 1);
-+ next;
-+ };
- &annonce_module($Prj) if (!(defined $module_annonced{$Prj}));
- $only_dependent = 0;
- $no_projects = 0;
- &BuildDependent($projects_deps_hash{$Prj});
-- if ($no_projects && ($running_children{$projects_deps_hash{$Prj}} == 0)) {
-+ if ($no_projects &&
-+ !$running_children{$projects_deps_hash{$Prj}} &&
-+ !defined $broken_modules_hashes{$projects_deps_hash{$Prj}})
-+ {
- chdir(&CorrectPath($StandDir.$Prj));
-- system (&get_deliver_commando($Prj)) if (!$show && ($Prj ne $CurrentPrj));
-- delete $projects_deps_hash{$Prj};
-- &RemoveFromDependencies($Prj, \%ParentDepsHash);
-+ system (&get_deliver_commando($Prj)) if (!$show && ($Prj ne $CurrentPrj));
-+ &RemoveFromDependencies($Prj, \%global_deps_hash);
- splice (@$build_queue, $i, 1);
- next;
- };
- $i++;
-+ &handle_dead_children;
- };
- $i = 0;
- } while (!&are_all_dependent($build_queue));
-@@ -1341,9 +1384,13 @@
- my $dir = shift;
- $dir =~ /([\w\d\.]+)$/;
- $_ = $1;
-- return '1' if (/^common$/);
-- return '1' if (/^common\.pro$/);
- return '1' if (defined $platforms{$_});
-+ if ($only_common) {
-+ return '1' if ($_ eq $only_common);
-+ } else {
-+ return '1' if (/^common$/);
-+ return '1' if (/^common\.pro$/);
-+ };
- return '';
- };
-
-@@ -1464,19 +1511,35 @@
- };
- };
-
-+sub get_modes {
-+ my $option = '';
-+ while ($option = shift @ARGV) {
-+ if ($option =~ /^-+/) {
-+ unshift(@ARGV, $option);
-+ return;
-+ } else {
-+ if ($option =~ /,/) {
-+ $build_modes{$`}++;
-+ unshift(@ARGV, $') if ($');
-+ } else {$build_modes{$option}++;};
-+ };
-+ };
-+ $build_modes{$option}++;
-+};
-+
- sub get_incomp_projects {
- my $option = '';
- while ($option = shift @ARGV) {
- if ($option =~ /^-+/) {
- unshift(@ARGV, $option);
-- last;
-+ return;
- } else {
- if ($option =~ /(:)/) {
- $option = $`;
- &print_error("-from switch collision") if ($build_from_opt);
- $build_from_opt = $';
- };
-- $incompartibles{$option}++;
-+ $incompartibles{$option}++;
- };
- };
- };
-@@ -1493,9 +1556,11 @@
- }
- foreach (@platforms_conf) {
- s/\s//g;
-+ next if ($only_platform && ($only_platform ne $_));
- my $s_path = $solver . '/' . $_;
- $platforms{$_}++ if (-e $s_path);
-- }
-+ };
-+ &print_error("There is no platform found!!") if (!scalar keys %platforms);
- return %platforms;
- };
-
-@@ -1641,13 +1706,13 @@
-
- sub mark_force_deliver {
- my ($module_name, $module_path) = @_;
-- my $cws_tag_string = 'Tcws_' . lc($ENV{WORK_STAMP}.'_'.$ENV{CWS_WORK_STAMP});
-+# my $cws_tag_string = 'Tcws_' . lc($ENV{WORK_STAMP}.'_'.$ENV{CWS_WORK_STAMP});
- my $cvs_tag_file = $module_path . '/CVS/Tag';
- return if (!open CVSTAG, "<$cvs_tag_file");
- my @tag = <CVSTAG>;
- close CVSTAG;
- $tag[0] =~ /^(\S+)/o;
-- $force_deliver{$module_name}++ if ($1 eq $cws_tag_string);
-+ $force_deliver{$module_name}++ if ($1 =~ /^Tcws_/o);
- };
-
- sub get_deliver_commando {
-@@ -1656,3 +1721,37 @@
- return $deliver_commando . ' -force';
- };
-
-+#
-+# Store all available build modi in %build_modes
-+#
-+sub get_build_modes {
-+ return if (scalar keys %build_modes);
-+ if (defined $ENV{BUILD_TYPE}) {
-+ if ($ENV{BUILD_TYPE} =~ /_/o) {
-+ my @build_modes = split (/_/, $ENV{BUILD_TYPE});
-+ $build_modes{$_}++ foreach (@build_modes)
-+ } else {
-+ $build_modes{$ENV{BUILD_TYPE}}++;
-+ };
-+ return;
-+ };
-+ $build_modes{'OOo'}++;
-+};
-+
-+#
-+# pick only the modules, that should be built for
-+# build types from %build_modes
-+#
-+sub pick_for_build_type {
-+ my $modules = shift;
-+ my @mod_array = split(/\s+/, $modules);
-+ my $new_modules = '';
-+ foreach (@mod_array) {
-+ if (/(\w+):(\S+)/o) {
-+ $new_modules .= $2 . ' ' if (defined $build_modes{$1});
-+ next;
-+ };
-+ $new_modules .= $_ . ' '
-+ };
-+ return $new_modules;
-+};
+++ /dev/null
---- oo_1.0_src/psprint/source/fontmanager/fontcache.cxx.fontcache Wed Mar 6 11:09:10 2002
-+++ oo_1.0_src/psprint/source/fontmanager/fontcache.cxx Fri Apr 12 13:39:43 2002
-@@ -466,6 +466,7 @@
- pTo->m_aAliases = pFrom->m_aAliases;
- pTo->m_nPSName = pFrom->m_nPSName;
- pTo->m_eItalic = pFrom->m_eItalic;
-+ pTo->m_eWeight = pFrom->m_eWeight;
- pTo->m_eWidth = pFrom->m_eWidth;
- pTo->m_ePitch = pFrom->m_ePitch;
- pTo->m_aEncoding = pFrom->m_aEncoding;
+++ /dev/null
---- oo_1.0_src/vcl/source/glyphs/gcach_ftyp.cxx.ft21 2002-06-04 10:35:42.000000000 +0200
-+++ oo_1.0_src/vcl/source/glyphs/gcach_ftyp.cxx 2002-06-04 10:46:33.000000000 +0200
-@@ -108,6 +108,13 @@
- #include <settings.hxx>
- #include <tools/lang.hxx>
-
-+#if defined(FT_NEXT_SHORT) && !defined(NEXT_Short)
-+// Freetype 2.1 isn't fully compatible with the *internal(!)* API used by OOo
-+#define NEXT_Short(x) FT_NEXT_SHORT(x)
-+#define NEXT_UShort(x) FT_NEXT_USHORT(x)
-+#define NEXT_Long(x) FT_NEXT_LONG(x)
-+#endif
-+
- // -----------------------------------------------------------------------
-
- static FT_Library aLibFT = 0;
+++ /dev/null
---- oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx.orig 2004-01-15 14:16:33.000000000 +0100
-+++ oo_1.1_src/vcl/source/glyphs/gcach_ftyp.cxx 2004-01-15 18:12:10.921457208 +0100
-@@ -77,12 +77,13 @@
- #include <osl/file.hxx>
- #include <osl/thread.hxx>
-
--#include "freetype/freetype.h"
--#include "freetype/ftglyph.h"
--#include "freetype/ftoutln.h"
--#include "freetype/tttables.h"
--#include "freetype/tttags.h"
--#include "freetype/ttnameid.h"
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TRUETYPE_TAGS_H
-+#include FT_TRUETYPE_IDS_H
-
- #ifndef FREETYPE_PATCH
- // VERSION_MINOR in freetype.h is too coarse
-
---- oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx.orig 2004-01-15 18:17:08.079282352 +0100
-+++ oo_1.1_src/vcl/source/glyphs/gcach_layout.cxx 2004-01-15 18:17:49.194031960 +0100
-@@ -68,7 +68,8 @@
- #endif
-
- #ifndef _SV_GCACHFTYP_HXX
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <gcach_ftyp.hxx>
- #endif
-
+++ /dev/null
-diff -Nur oo/config_office/set_soenv.1 oo.new/config_office/set_soenv.1
---- oo/config_office/set_soenv.1 Wed Mar 20 19:10:58 2002
-+++ oo.new/config_office/set_soenv.1 Sun Apr 14 23:56:12 2002
-@@ -657,7 +657,7 @@
- { if ( $ARGV[ 0 ] eq $no_gcc)
- { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
- printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
-- my $answer = <STDIN>;
-+ my $answer = "n";
- chomp( $answer );
- if ( $answer eq "y" || $answer eq "Y" )
- { $GCC_HOME = GetValue( "Please enter the gcc 2.95.2 --prefix value: " );
-diff -Nur oo/cppuhelper/source/gcc2_linux_intel.map oo.new/cppuhelper/source/gcc2_linux_intel.map
---- oo/cppuhelper/source/gcc2_linux_intel.map Tue Sep 4 11:03:09 2001
-+++ oo.new/cppuhelper/source/gcc2_linux_intel.map Mon Apr 15 00:52:56 2002
-@@ -45,7 +45,6 @@
- __Q53com3sun4star3uno19WeakReferenceHelperRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star3uno10XInterface;
- __as__Q53com3sun4star3uno19WeakReferenceHelperRCQ53com3sun4star3uno19WeakReferenceHelper;
- __bss_start;
--__pure_virtual;
- __tiQ24cppu11OWeakObject;
- __tiQ24cppu14OWeakAggObject;
- __tiQ24cppu16OComponentHelper;
+++ /dev/null
---- oo/tools/bootstrp/static.mk.orig Wed Jan 22 22:54:04 2003
-+++ oo/tools/bootstrp/static.mk Wed Jan 22 22:54:27 2003
-@@ -2,9 +2,9 @@
- #
- # $RCSfile$
- #
--# $Revision$
-+# $Revision$
- #
--# last change: $Author$ $Date$
-+# last change: $Author$ $Date$
- #
- # The Contents of this file are made available subject to the terms of
- # either of the following licenses
-@@ -60,11 +60,21 @@
- #
- #*************************************************************************
-
-+.IF "$(OFFICEUPD)"==""
-+STATICUPD=$(UPD)
-+.ELSE
-+STATICUPD=$(OFFICEUPD)
-+.ENDIF
-+
- .IF "$(GUI)"=="WNT"
- # -----------------------------------------------------------
- # --------------------- Windows32 ---------------------------
- # -----------------------------------------------------------
--SALLIBST = $(SALLIB)
-+#.IF "$(STATICUPD)" >= 640
-+#SALLIBST = $(SALLIB)
-+#.ELSE
-+SALLIBST = asal.lib
-+#.ENDIF
- BOOTSTRP = bootstrp.lib
- TRANSEX = transex.lib
- VERMAP = bsvermap.lib
-@@ -81,20 +91,10 @@
- .ELSE
- STATIC_LIBS += atools.lib
- .ENDIF
--.IF "$(UPD)" >= "590"
--STATIC_LIBS += kernel9x.lib \
-- advapi9x.lib \
-- shell9x.lib
--.IF "$(UPD)" >= "604"
--STATIC_LIBS += tools32.lib
--.ENDIF
--.ENDIF
--.IF "$(UPD)" >= "546"
--STATIC_LIBS += $(SALLIB)
--.ELSE
--STATIC_LIBS += aosl.lib \
-- artl.lib
--.ENDIF
-+STATIC_LIBS += uwinapi.lib \
-+ ascii_expat_xmlparse.lib \
-+ expat_xmltok.lib \
-+ $(SALLIB)
- .IF "$(LIBSTLPORT)" != ""
- STATIC_LIBS += $(LIBSTLPORT)
- .ENDIF
-@@ -123,16 +123,9 @@
- $(LIBSTLPORTST) \
- $(STATIC)
-
--.IF "$(UPD)" >= "546"
--.IF "$(UPD)" >= "604"
--STATIC_LIBS += -lsal$(SAL_MAJOR)$(DLLPOSTFIX)
--.ELSE
--STATIC_LIBS += -lsal$(UPD)$(DLLPOSTFIX)
--.ENDIF
--.ELSE
--STATIC_LIBS += -losl$(UPD)$(DLLPOSTFIX) \
-- -lrtl$(UPD)$(DLLPOSTFIX)
--.ENDIF
-+STATIC_LIBS += -lsal$(SAL_MAJOR)$(DLLPOSTFIX) \
-+ -lascii_expat_xmlparse \
-+ -lexpat_xmltok
-
- .IF "$(COM)"=="C52"
- .IF "$(BUILD_SOSL)"==""
-@@ -148,8 +141,14 @@
- STATIC_LIBS += -lnsl -lsocket -lposix4 -lc
- .ENDIF
- .IF "$(OS)"=="LINUX"
--STATIC_LIBS += -lsupc++ -lX11 -lXext
--.ENDIF
-+.IF "$(COM)"=="GCC"
-+.IF "$(CVER)"!="C295"
-+STATIC_LIBS += -lsupc++ -lX11 -lXext
-+.ELSE
-+STATIC_LIBS += -lX11 -lXext
-+.ENDIF # CVER
-+.ENDIF # GCC
-+.ENDIF # LINUX
-
- # -----------------------------------------------------------
-
-@@ -162,12 +161,7 @@
- VERMAP = bsvermap.lib
- STATIC_LIBS = $(L)$/atools.lib \
- $(L)$/avos.lib
--.IF "$(UPD)" >= "546"
- STATIC_LIBS += $(L)$/asal.lib
--.ELSE
--STATIC_LIBS += $(L)$/aosl.lib \
-- $(L)$/artl.lib
--.ENDIF
- # -----------------------------------------------------------
-
- .ENDIF
+++ /dev/null
---- oo_1.0.1_src/cppu/inc/uno/lbnames.h.jj Thu Jul 18 14:41:47 2002
-+++ oo_1.0.1_src/cppu/inc/uno/lbnames.h Thu Jul 18 15:19:43 2002
-@@ -96,12 +96,10 @@ provoking error here, because PP ignores
- #define __CPPU_ENV gcc2
- #elif (__GNUC__ == 2)
- #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version."
--#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
-+#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 2)
- #define __CPPU_ENV gcc3
--#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 1)
--#define __CPPU_ENV gcc3
- #elif (__GNUC__ == 3)
--#error "Tested gcc 3 version is <= 3.1. Patch uno/lbnames.h to try your gcc 3 version."
-+#error "Tested gcc 3 version is <= 3.2. Patch uno/lbnames.h to try your gcc 3 version."
- #else
- #error "Supported gcc majors are 2 and 3. Unsupported gcc major version."
- #endif /* defined (__GNUC__) */
---- oo_1.0.1_src/product/inc/scp/udk_basefiles.scp.jj Fri Jun 7 20:15:12 2002
-+++ oo_1.0.1_src/product/inc/scp/udk_basefiles.scp Thu Jul 18 15:22:54 2002
-@@ -13,9 +13,10 @@ End
-
- #if ( CCNUMVER >= 000300010000 )
-
-+#ifdef NOTHING
- File gid_File_Lib_Stdc
- BIN_FILE_BODY;
-- Name = STRING(libstdc++.so.4.0.0);
-+ Name = STRING(libstdc++.so.5.0.1);
- Dir = GCFG_BINARY_DIR;
- Styles = (PACKED, SETUPZIP);
- End
-@@ -27,6 +28,7 @@ Shortcut gid_Shortcut_Lib_Stdc
- Styles = (NETWORK,RELATIVE);
- End
-
-+#endif
- #else
-
- File gid_File_Lib_Stdc
---- oo_1.0.1_src/product/util/makefile.mk.jj Tue Jun 11 17:09:39 2002
-+++ oo_1.0.1_src/product/util/makefile.mk Thu Jul 18 15:22:00 2002
-@@ -117,8 +117,8 @@ BINDINGDLL=$(COMNAME)_uno
- ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
- $(DESTDIRDLL)$/libgcc_s.so \
-- $(DESTDIRDLL)$/libstdc++.so.4 \
-- $(DESTDIRDLL)$/libstdc++.so.4.0.0
-+ $(DESTDIRDLL)$/libstdc++.so.5 \
-+ $(DESTDIRDLL)$/libstdc++.so.5.0.1
- .ELSE
- ADDITIONAL_DLLS= \
- $(DESTDIRDLL)$/libgcc_s.so.1 \
-@@ -500,13 +500,13 @@ $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX
-
- .IF "$(CCNUMVER)">="000300010000"
-
--$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5.0.1 : $(DLLOUT)$/libstdc++.so.5.0.1 $(DIRLIST)
- -rm -f $@
-- $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
-+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.1 $@
-
--$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.1 $(DIRLIST)
- -rm -f $@
-- +ln -s libstdc++.so.4.0.0 $@
-+ +ln -s libstdc++.so.5.0.1 $@
-
- .ELSE
-
+++ /dev/null
-Index: vcl/unx/source/gdi/dtint.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/dtint.cxx,v
-retrieving revision 1.16
-retrieving revision 1.16.112.2
-diff -u -3 -p -r1.16 -r1.16.112.2
---- vcl/unx/source/gdi/dtint.cxx 28 May 2003 12:33:47 -0000 1.16
-+++ vcl/unx/source/gdi/dtint.cxx 10 Nov 2003 10:43:05 -0000 1.16.112.2
-@@ -138,6 +138,27 @@ DtIntegrator* DtIntegrator::CreateDtInte
- if( pIntegrator->mpDisplay == pDisplay )
- return pIntegrator;
- }
-+ /*
-+ * #i22061# override desktop detection
-+ * if environment variable OOO_FORCE_DESKTOP is set
-+ * to one of "cde" "kde" "gnome" then autodetection
-+ * is overridden.
-+ */
-+ static const char* pOverride = getenv( "OOO_FORCE_DESKTOP" );
-+ if( pOverride && *pOverride )
-+ {
-+ OString aOver( pOverride );
-+#if USE_CDE
-+ if( aOver.equalsIgnoreAsciiCase( "cde" ) == 0 )
-+ return new CDEIntegrator( pFrame );
-+#endif
-+ if( aOver.equalsIgnoreAsciiCase( "kde" ) == 0 )
-+ return new KDEIntegrator( pFrame );
-+ if( aOver.equalsIgnoreAsciiCase( "gnome" ) == 0 )
-+ return new GNOMEIntegrator( pFrame );
-+ if( aOver.equalsIgnoreAsciiCase( "none" ) == 0 )
-+ return new DtIntegrator( pFrame );
-+ }
-
- Atom nDtAtom = None;
-
+++ /dev/null
-? vcl/util/vcl-gcc3.map
-Index: vcl/source/src/msgbox.bmp
-===================================================================
-RCS file: /cvs/gsl/vcl/source/src/msgbox.bmp,v
-retrieving revision 1.1.1.1
-diff -u -p -u -r1.1.1.1 msgbox.bmp
-Binary files /tmp/cvsM6aind and msgbox.bmp differ
-Index: vcl/unx/source/gdi/getstyle/getstyle-gnome.c
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/getstyle/getstyle-gnome.c,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 getstyle-gnome.c
---- vcl/unx/source/gdi/getstyle/getstyle-gnome.c 27 Mar 2003 17:58:57 -0000 1.5
-+++ vcl/unx/source/gdi/getstyle/getstyle-gnome.c 13 May 2003 11:28:48 -0000
-@@ -139,6 +139,25 @@ void printColor( int eStyle, GdkColor* p
- pColor->blue/256 );
- }
-
-+/* We special case menu items because they use a "menuitem" detail field when
-+ * calling gtk_paint_flat_box().
-+ */
-+void
-+printMenuColors (void)
-+{
-+ GtkWidget *item;
-+ GtkStyle *style;
-+
-+ item = gtk_menu_item_new ();
-+ gtk_widget_ensure_style (item);
-+
-+ style = gtk_rc_get_style (item);
-+ printColor (MenuHighlightColor, &style->bg[GTK_STATE_PRELIGHT]);
-+ printColor (MenuHighlightTextColor, &style->fg[GTK_STATE_PRELIGHT]);
-+
-+ gtk_widget_destroy (item);
-+}
-+
- void printFont( int eStyle, PangoFontDescription* pFont )
- {
- PangoWeight eWeight;
-@@ -194,6 +213,8 @@ void printVCLStyle( GtkWidget* widget )
- printColor( HighlightTextColor, &pStyle->text[GTK_STATE_SELECTED] );
- printColor( FieldColor, &pStyle->base[GTK_STATE_NORMAL] );
- printColor( WindowColor, &pStyle->base[GTK_STATE_NORMAL] );
-+ printColor( CheckedColor, &pStyle->bg[GTK_STATE_ACTIVE] );
-+ printMenuColors();
-
- printFont( UIFont, pStyle->font_desc );
-
-@@ -299,8 +319,10 @@ int main (int argc, char **argv)
- #endif
-
- /* realize the widgets, do not show it to avoid flicker */
-- gtk_widget_realize(mainwin);
-- gtk_widget_realize(toolbar);
-+ gtk_widget_ensure_style( mainwin );
-+ gtk_widget_ensure_style( toolbar );
-+ gtk_widget_realize( mainwin );
-+ gtk_widget_realize( toolbar );
-
- /* Enter the main event loop, and wait for user interaction */
- gtk_main ();
-;Index: vcl/unx/source/gdi/getstyle/makefile.mk
-;===================================================================
-;RCS file: /cvs/gsl/vcl/unx/source/gdi/getstyle/makefile.mk,v
-;retrieving revision 1.3
-;diff -u -p -u -r1.3 makefile.mk
-;--- vcl/unx/source/gdi/getstyle/makefile.mk 27 Mar 2003 17:58:57 -0000 1.3
-;+++ vcl/unx/source/gdi/getstyle/makefile.mk 13 May 2003 11:28:48 -0000
-;@@ -95,10 +95,8 @@ HASGNOME2=TRUE
-;
-; ALLTAR: $(BIN)$/getstyle-gnome
-;
-;-.IF "$(HASGNOME2)"=="TRUE"
-;-$(BIN)$/getstyle-gnome:
-;- +$(COPY) $(GETSTYLE_GNOME) $@
-;-.ELSE
-;-$(BIN)$/getstyle-gnome:
-;- +$(TOUCH) $@
-;-.ENDIF
-;+$(BIN)$/getstyle-gnome: getstyle-gnome.c
-;+ setenv UGLY_HACK_INDEED "$/LD_LIBRARY_PATH"; \
-;+ unsetenv LD_LIBRARY_PATH; \
-;+ $(CC) `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0` -o $(BIN)$/getstyle-gnome getstyle-gnome.c; \
-;+ setenv LD_LIBRARY_PATH "$/UGLY_HACK_INDEED"
+++ /dev/null
-Index: vcl/unx/source/window/salframe.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
-retrieving revision 1.163
-diff -u -p -u -r1.163 salframe.cxx
---- vcl/unx/source/window/salframe.cxx 1 Jul 2003 14:49:01 -0000 1.163
-+++ vcl/unx/source/window/salframe.cxx 20 Aug 2003 11:03:39 -0000
-@@ -2271,7 +2271,17 @@ bool SalFrame::SetPluginParent( SystemPa
- // Sound
- // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
- void SalFrame::Beep( SoundType eSoundType ) // not fully suported
--{ _GetDisplay()->Beep(); }
-+{
-+ switch (eSoundType) {
-+ case SOUND_DEFAULT:
-+ case SOUND_ERROR:
-+ _GetDisplay()->Beep();
-+ break;
-+ default:
-+ // Excessive beeping averted
-+ break;
-+ }
-+}
-
- // Callback
- // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+++ /dev/null
-Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 Common.xcs
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 24 Jul 2003 13:12:08 -0000 1.84
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 29 Aug 2003 13:32:53 -0000
-@@ -13180,11 +13180,11 @@
- <label xml:lang="th">Font Antialiasing Minimum Pixel Height</label>
- <label xml:lang="x-comment">Font Antialiasing Minimum Pixel Height</label>
- </info>
-- <value>8</value>
-+ <value>1</value>
- </prop>
-- </group>
-+ </group> <!-- dummy -->
- </group>
-- <group oor:name="Undo">
-+ <group oor:name="Undo"> <!-- dummy -->
- <info>
- <author>MBA</author>
- <desc xml:lang="en-US">Contains the settings regarding the undo operation in the Office.</desc>
+++ /dev/null
-Index: vcl/source/app/settings.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/app/settings.cxx,v
-retrieving revision 1.38
-diff -u -3 -p -r1.38 settings.cxx
---- vcl/source/app/settings.cxx 11 Apr 2003 17:27:37 -0000 1.38
-+++ vcl/source/app/settings.cxx 23 Oct 2003 15:41:27 -0000
-@@ -592,7 +592,7 @@ ImplStyleData::ImplStyleData( const Impl
-
- void ImplStyleData::SetStandardStyles()
- {
-- Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
-+ Font aStdFont( FAMILY_SWISS, Size( 0, 9 ) );
- aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
- aStdFont.SetWeight( WEIGHT_NORMAL );
- aStdFont.SetName( vcl::DefaultFontConfigItem::get()->getUserInterfaceFont(LANGUAGE_ENGLISH) );
+++ /dev/null
-
- We have to use Xft's hard-coded idea of the dpi first, and use
-the builtin toDouble to avoid l10n issues.
-
---- vcl/unx/source/app/saldisp.cxx 8 Aug 2002 02:49:59 -0000 1.31.2.3
-+++ vcl/unx/source/app/saldisp.cxx 14 Jan 2003 20:17:05 -0000
-@@ -833,9 +833,20 @@
- pVisual_ = new SalVisual( pXVI );
- aSize_ = Size( DisplayWidth ( pDisp_, nScreen_ ),
- DisplayHeight( pDisp_, nScreen_ ) );
-- aResolution_ =
-+ {
-+ const char *value;
-+ long dpi = 0;
-+ if ((value = XGetDefault (pDisp_, "Xft", "dpi"))) {
-+ ::rtl::OString str (value);
-+ dpi = (long) str.toDouble();
-+ }
-+ if (dpi > 0)
-+ aResolution_ = Pair( dpi, dpi );
-+ else
-+ aResolution_ =
- Pair( DPI( aSize_.Width(), DisplayWidthMM ( pDisp_, nScreen_ ) ),
- DPI( aSize_.Height(), DisplayHeightMM( pDisp_, nScreen_ ) ) );
-+ }
-
- nMaxRequestSize_ = XExtendedMaxRequestSize( pDisp_ ) * 4;
- if( !nMaxRequestSize_ )
-
-
-
-Index: vcl/source/window/window.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
-retrieving revision 1.176
-diff -u -3 -p -r1.176 window.cxx
---- vcl/source/window/window.cxx 1 Jul 2003 14:48:37 -0000 1.176
-+++ vcl/source/window/window.cxx 7 Nov 2003 16:01:31 -0000
-@@ -1659,6 +1659,7 @@ void Window::ImplInitResolutionSettings(
- }
-
- // -----------------------------------------------------------------------
-+#include <stdio.h>
-
- void Window::ImplPointToLogic( Font& rFont ) const
- {
-@@ -1667,17 +1668,21 @@ void Window::ImplPointToLogic( Font& rFo
-
- if ( aSize.Width() )
- {
-- aSize.Width() *= mpFrameData->mnFontDPIX;
-- aSize.Width() += 72/2;
-- aSize.Width() /= 72;
-- aSize.Width() *= nScreenFontZoom;
-- aSize.Width() /= 100;
-- }
-- aSize.Height() *= mpFrameData->mnFontDPIY;
-- aSize.Height() += 72/2;
-- aSize.Height() /= 72;
-- aSize.Height() *= nScreenFontZoom;
-- aSize.Height() /= 100;
-+ double t = aSize.Width();
-+ t *= nScreenFontZoom;
-+ t /= 100.0;
-+ t *= mpFrameData->mnFontDPIX;
-+ t /= 72.0;
-+ t += 0.5;
-+ aSize.Width() = (long) t;
-+ }
-+ double t = aSize.Height();
-+ t *= nScreenFontZoom;
-+ t /= 100.0;
-+ t *= mpFrameData->mnFontDPIY;
-+ t /= 72.0;
-+ t += 0.5;
-+ aSize.Height() = (long) t;
-
- if ( IsMapModeEnabled() )
- aSize = PixelToLogic( aSize );
-@@ -1697,17 +1702,22 @@ void Window::ImplLogicToPoint( Font& rFo
-
- if ( aSize.Width() )
- {
-- aSize.Width() *= 100;
-- aSize.Width() /= nScreenFontZoom;
-- aSize.Width() *= 72;
-- aSize.Width() += mpFrameData->mnFontDPIX/2;
-- aSize.Width() /= mpFrameData->mnFontDPIX;
-- }
-- aSize.Height() *= 100;
-- aSize.Height() /= nScreenFontZoom;
-- aSize.Height() *= 72;
-- aSize.Height() += mpFrameData->mnFontDPIY/2;
-- aSize.Height() /= mpFrameData->mnFontDPIY;
-+ double t = aSize.Width();
-+ t -= 0.5;
-+ t *= 72.0;
-+ t /= mpFrameData->mnFontDPIX;
-+ t *= 100.0;
-+ t /= nScreenFontZoom;
-+ aSize.Width() = (long) t;
-+ }
-+
-+ double t = aSize.Height();
-+ t -= 0.5;
-+ t *= 72.0;
-+ t /= mpFrameData->mnFontDPIY;
-+ t *= 100.0;
-+ t /= nScreenFontZoom;
-+ aSize.Height() = (long) t;
-
- rFont.SetSize( aSize );
- }
---- vcl/unx/source/gdi/salgdi.cxx.orig 2004-03-30 01:30:52.000000000 +0000
-+++ vcl/unx/source/gdi/salgdi.cxx 2004-03-30 01:31:05.000000000 +0000
-@@ -503,16 +503,6 @@
-
- rDPIX = pDisplay->GetResolution().A();
- rDPIY = pDisplay->GetResolution().B();
-- if ( rDPIY < 96 )
-- {
-- rDPIX = Divide( rDPIX * 96, rDPIY );
-- rDPIY = 96;
-- }
-- else if ( rDPIY > 200 )
-- {
-- rDPIX = Divide( rDPIX * 200, rDPIY );
-- rDPIY = 200;
-- }
-
- #ifndef _USE_PRINT_EXTENSION_
- }
-Index: vcl/unx/source/app/saldisp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
-retrieving revision 1.41
-diff -u -p -u -r1.41 saldisp.cxx
---- vcl/unx/source/app/saldisp.cxx 28 May 2003 12:33:35 -0000 1.41
-+++ vcl/unx/source/app/saldisp.cxx 4 Jun 2003 08:57:54 -0000
-@@ -2948,11 +2948,13 @@ void SalDisplay::GetScreenFontResolution
- rDPIX = aResolution_.A();
- rDPIY = aResolution_.B();
-
-+#if 0
- if( rDPIY < nThreshold )
- {
- rDPIX = Divide( rDPIX * nThreshold, rDPIY );
- rDPIY = nThreshold;
- }
-+#endif
-
- // #i12705# equalize x- and y-resolution if they are close enough
- if( rDPIX != rDPIY )
+++ /dev/null
-Index: vcl/source/window/window.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
-retrieving revision 1.176
-diff -u -p -u -r1.176 window.cxx
---- vcl/source/window/window.cxx 1 Jul 2003 14:48:37 -0000 1.176
-+++ vcl/source/window/window.cxx 10 Jul 2003 17:40:59 -0000
-@@ -392,7 +392,7 @@ void Window::ImplUpdateGlobalSettings( A
- rSettings.SetStyleSettings( aStyleSettings );
- }
-
-- if( 1 )
-+ if( 0 ) // This is/was an incredibly broken thing to do
- {
- // #97047: Force all fonts except Mneu and Help to a fixed height
- // to avoid UI scaling due to large fonts
+++ /dev/null
-Index: vcl/unx/inc/kdeint.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/kdeint.hxx,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 kdeint.hxx
---- vcl/unx/inc/kdeint.hxx 10 Jun 2002 17:27:27 -0000 1.4
-+++ vcl/unx/inc/kdeint.hxx 22 Oct 2003 17:14:11 -0000
-@@ -74,6 +74,8 @@ class KDEIntegrator : public DtIntegrato
- private:
- KDEIntegrator( SalFrame* );
-
-+ Font parseKDEFont( const ByteString& rLine );
-+
- public:
- virtual ~KDEIntegrator();
-
-Index: vcl/unx/source/gdi/kdeint.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/kdeint.cxx,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 kdeint.cxx
---- vcl/unx/source/gdi/kdeint.cxx 16 Jul 2003 17:46:57 -0000 1.10
-+++ vcl/unx/source/gdi/kdeint.cxx 23 Oct 2003 09:34:24 -0000
-@@ -89,6 +89,46 @@ static char* pTryFiles[] =
- "~/.kderc"
- };
-
-+Font KDEIntegrator::parseKDEFont( const ByteString& rLine )
-+{
-+ rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-+
-+ Font aFont;
-+ xub_StrLen nIndex = 0;
-+
-+ ByteString aToken = rLine.GetToken( 0, ',', nIndex );
-+
-+ if( aToken.Len() ) {
-+ aFont.SetName( String( aToken, osl_getThreadTextEncoding() ) );
-+ }
-+
-+ aToken = rLine.GetToken( 0, ',', nIndex );
-+ aFont.SetHeight( aToken.ToInt32() );
-+
-+ aToken = rLine.GetToken( 2, ',', nIndex );
-+
-+ if( aToken.Len() ) {
-+ int nWeight = aToken.ToInt32();
-+ if( nWeight < 30) {
-+ aFont.SetWeight( WEIGHT_LIGHT );
-+ }
-+ else if( nWeight > 70) {
-+ aFont.SetWeight( WEIGHT_BOLD );
-+ }
-+ }
-+
-+ aToken = rLine.GetToken( 0, ',', nIndex );
-+ if( aToken.Len() ) {
-+ int nItalic = aToken.ToInt32();
-+ if( nItalic == 1) {
-+ aFont.SetItalic( ITALIC_NORMAL );
-+ }
-+ }
-+
-+ return aFont;
-+
-+}
-+
- void KDEIntegrator::GetSystemLook( AllSettings& rSettings )
- {
- rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-@@ -227,12 +267,10 @@ void KDEIntegrator::GetSystemLook( AllSe
- aLine = aConfig.ReadKey( "font" );
- if( aLine.Len() )
- {
-- Font aFont = aStyleSettings.GetAppFont();
-- aFont.SetName( String( aLine, gsl_getSystemTextEncoding() ) );
--
-+ Font aFont = parseKDEFont(aLine);
-+
- aStyleSettings.SetAppFont( aFont );
- aStyleSettings.SetHelpFont( aFont );
-- aStyleSettings.SetMenuFont( aFont );
- aStyleSettings.SetToolFont( aFont );
- aStyleSettings.SetLabelFont( aFont );
- aStyleSettings.SetInfoFont( aFont );
-@@ -241,6 +279,14 @@ void KDEIntegrator::GetSystemLook( AllSe
- aStyleSettings.SetFieldFont( aFont );
- aStyleSettings.SetIconFont( aFont );
- aStyleSettings.SetGroupFont( aFont );
-+ }
-+
-+ aLine = aConfig.ReadKey( "menuFont" );
-+ if( aLine.Len() )
-+ {
-+ Font aFont = parseKDEFont(aLine);
-+
-+ aStyleSettings.SetMenuFont( aFont );
- }
- }
-
+++ /dev/null
-Index: vcl/source/glyphs/gcach_ftyp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
-retrieving revision 1.90
-diff -u -p -u -r1.90 gcach_ftyp.cxx
---- vcl/source/glyphs/gcach_ftyp.cxx 24 Apr 2003 10:29:11 -0000 1.90
-+++ vcl/source/glyphs/gcach_ftyp.cxx 13 May 2003 12:55:20 -0000
-@@ -113,6 +113,13 @@
- #include <settings.hxx>
- #include <tools/lang.hxx>
-
-+#if defined(FT_NEXT_SHORT) && !defined(NEXT_Short)
-+// Freetype 2.1 isn't fully compatible with the *internal(!)* API used by OOo
-+# define NEXT_Short(x) FT_NEXT_SHORT(x)
-+# define NEXT_UShort(x) FT_NEXT_USHORT(x)
-+# define NEXT_Long(x) FT_NEXT_LONG(x)
-+#endif
-+
- // -----------------------------------------------------------------------
-
- static FT_Library aLibFT = 0;
+++ /dev/null
-Index: vcl/unx/source/gdi/dtint.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/dtint.cxx,v
-retrieving revision 1.16
-diff -u -p -u -r1.16 dtint.cxx
---- vcl/unx/source/gdi/dtint.cxx 28 May 2003 12:33:47 -0000 1.16
-+++ vcl/unx/source/gdi/dtint.cxx 10 Jun 2003 14:17:38 -0000
-@@ -229,19 +229,8 @@ Font DtIntegrator::parseFont( const Byte
- xub_StrLen nIndex = nPos2;
- ByteString aToken = rLine.GetToken( 1, ',', nIndex );
- if( aToken.Len() )
-- {
-- int nPixelHeight = aToken.ToInt32();
-- long nDPIX, nDPIY;
-- long nDispDPIY = mpSalDisplay->GetResolution().B();
-- mpSalDisplay->GetScreenFontResolution( nDPIX, nDPIY );
-- int nHeight = nPixelHeight * nDispDPIY / nDPIY;
-- // allow for rounding in back conversion (at SetFont)
-- while( (nHeight * nDPIY / nDispDPIY) > nPixelHeight )
-- nHeight--;
-- while( (nHeight * nDPIY / nDispDPIY) < nPixelHeight )
-- nHeight++;
-- aFont.SetHeight( nHeight );
-- }
-+ aFont.SetHeight( (long) OString(aToken).toDouble() );
-+
- while( nIndex != STRING_NOTFOUND )
- {
- aToken = rLine.GetToken( 0, ',', nIndex );
+++ /dev/null
-Index: vcl/source/glyphs/gcach_ftyp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
-retrieving revision 1.91
-diff -u -p -u -r1.91 gcach_ftyp.cxx
---- vcl/source/glyphs/gcach_ftyp.cxx 28 May 2003 12:31:48 -0000 1.91
-+++ vcl/source/glyphs/gcach_ftyp.cxx 4 Jun 2003 11:04:24 -0000
-@@ -904,7 +911,7 @@ void FreetypeServerFont::InitGlyphData(
- int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-
-- int nLoadFlags = mnLoadFlags;
-+ int nLoadFlags = mnLoadFlags | FT_LOAD_TARGET_LIGHT;
- if( nGlyphFlags & GF_UNHINTED )
- nLoadFlags |= FT_LOAD_NO_HINTING;
-
-@@ -981,7 +988,7 @@ bool FreetypeServerFont::GetGlyphBitmap1
- int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-
-- FT_Int nLoadFlags = mnLoadFlags;
-+ FT_Int nLoadFlags = mnLoadFlags | FT_LOAD_TARGET_LIGHT;
-
- #if (FTVERSION >= 2002)
- // for 0/90/180/270 degree fonts enable autohinting even if not advisable
-@@ -1072,7 +1079,7 @@ bool FreetypeServerFont::GetGlyphBitmap8
- int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-
-- FT_Int nLoadFlags = mnLoadFlags;
-+ FT_Int nLoadFlags = mnLoadFlags | FT_LOAD_TARGET_LIGHT;
-
- #if (FTVERSION <= 2004) && !defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
- // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
-@@ -1600,7 +1607,7 @@ bool FreetypeServerFont::GetGlyphOutline
- int nGlyphFlags;
- SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-
-- FT_Int nLoadFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
-+ FT_Int nLoadFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP | FT_LOAD_TARGET_LIGHT;
- FT_Error rc = FT_Load_Glyph( maFaceFT, nGlyphIndex, nLoadFlags );
- if( rc != FT_Err_Ok )
- return false;
+++ /dev/null
-Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 Common.xcs
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 24 Jul 2003 13:12:08 -0000 1.84
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 29 Aug 2003 13:41:32 -0000
-@@ -26662,9 +26662,9 @@
- <label xml:lang="th">Use system default user interface font</label>
- <label xml:lang="x-comment">Use system default user interface font</label>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
-- <prop oor:name="IsSelectionInReadonly" oor:type="xs:boolean">
-+ <prop oor:name="IsSelectionInReadonly" oor:type="xs:boolean"> <!-- dummy -->
- <info>
- <author>OS</author>
- <desc xml:lang="en-US">Indicates whether the cursor is displayed in read-only texts.</desc>
+++ /dev/null
-Index: vcl/source/control/fixed.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/control/fixed.cxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 fixed.cxx
---- vcl/source/control/fixed.cxx 17 Oct 2002 14:47:00 -0000 1.10
-+++ vcl/source/control/fixed.cxx 12 Sep 2003 14:38:28 -0000
-@@ -73,6 +73,9 @@
- #ifndef _VCL_CONTROLLAYOUT_HXX
- #include <controllayout.hxx>
- #endif
-+#ifndef _SV_BITMAPEX_HXX
-+#include <bitmapex.hxx>
-+#endif
-
- #include <rc.h>
-
-@@ -810,14 +820,16 @@ void FixedBitmap::ImplDraw( OutputDevice
- else
- {
- // Haben wir ueberhaupt eine Bitmap
-- if ( !(!(*pBitmap)) )
-+ if ( !!(*pBitmap) )
- {
-+ BitmapEx aEx( *pBitmap );
-+
- if ( GetStyle() & WB_SCALE )
-- pDev->DrawBitmap( rPos, rSize, *pBitmap );
-+ pDev->DrawBitmapEx( rPos, rSize, aEx );
- else
- {
- Point aPos = ImplCalcPos( GetStyle(), rPos, pBitmap->GetSizePixel(), rSize );
-- pDev->DrawBitmap( aPos, *pBitmap );
-+ pDev->DrawBitmapEx( aPos, aEx );
- }
- }
- }
+++ /dev/null
-Index: vcl/source/gdi/image.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/image.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 image.cxx
---- vcl/source/gdi/image.cxx 27 Mar 2003 17:57:57 -0000 1.8
-+++ vcl/source/gdi/image.cxx 16 Sep 2003 10:55:26 -0000
-@@ -103,6 +103,16 @@ DBG_NAME( ImageList );
-
- // =======================================================================
-
-+static void SplitAlpha( Bitmap &rImage, Bitmap &rMask )
-+{
-+ if( rImage.GetBitCount() < 32 )
-+ return;
-+
-+ rMask = rImage.GetAlphaMask();
-+}
-+
-+// =======================================================================
-+
- ImplImageList::~ImplImageList()
- {
- if ( mpImageBitmap )
-@@ -151,8 +161,14 @@ ImplImageData::ImplImageData( const Bitm
- maBmp( rBmp ),
- maColor( rColor )
- {
-- mbColor = TRUE;
-- mpImageBitmap = NULL;
-+ if( rBmp.GetBitCount() > 24 )
-+ {
-+ maMaskBmp = rBmp.GetAlphaMask();
-+ mbColor = FALSE;
-+ }
-+ else
-+ mbColor = TRUE;
-+ mpImageBitmap = NULL;
- }
-
- // -----------------------------------------------------------------------
-@@ -240,6 +256,8 @@ Image::Image( const ResId& rResId )
- pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
- }
-
-+ SplitAlpha( aImageBitmap, aMaskBitmap );
-+
- if ( !aImageBitmap )
- mpImplData = NULL;
- else
-@@ -786,6 +804,12 @@ static void ImplBmpImageCreate( ImageLis
- return;
- }
-
-+ if( !rMaskBmp && rBitmap.GetBitCount() == 32 )
-+ {
-+ rMaskBmp = rBitmap.GetAlphaMask();
-+ bColor = FALSE;
-+ }
-+
- DBG_ASSERT( !nInit || rBitmap.GetSizePixel().Width(),
- "ImageList::ImageList(): nInitSize != 0 and BmpSize.Width() == 0" );
- DBG_ASSERT( (rBitmap.GetSizePixel().Width() % nInit) == 0,
-@@ -893,6 +917,7 @@ ImageList::ImageList( const ResId& rResI
- pResMgr->Increment( pResMgr->GetObjSize( (RSHEADER_TYPE*)pResMgr->GetClass() ) );
- bCol = TRUE;
- }
-+ SplitAlpha( aImageBitmap, aMaskBitmap );
- if ( nObjMask & RSC_IMAGELIST_IDLIST )
- {
- bIsIdList = TRUE;
+++ /dev/null
-Index: vcl/inc/image.h
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/image.h,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 image.h
---- vcl/inc/image.h 22 Aug 2002 13:54:19 -0000 1.3
-+++ vcl/inc/image.h 15 Sep 2003 13:52:49 -0000
-@@ -85,6 +85,7 @@ class ImplImageBmp
- Bitmap aBmp;
- Bitmap aMask;
- Bitmap aDisa;
-+ Bitmap aDisaMask;
- Bitmap aBmpDisp;
- Bitmap aMaskDisp;
- Bitmap aDisaDisp;
-Index: vcl/source/gdi/impimage.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/impimage.cxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 impimage.cxx
---- vcl/source/gdi/impimage.cxx 22 Aug 2002 13:57:18 -0000 1.10
-+++ vcl/source/gdi/impimage.cxx 25 Sep 2003 08:48:08 -0000
-@@ -193,8 +193,10 @@ void ImplImageBmp::Expand( USHORT nGrowS
- aBmp.Expand( nDX, 0UL );
- aMask.Expand( nDX, 0UL );
-
-- if( !!aDisa )
-+ if( !!aDisa ) {
- aDisa.Expand( nDX, 0UL );
-+ aDisaMask.Expand( nDX, 0UL );
-+ }
-
- memset( pNewAry, 0, nSize );
- memcpy( pNewAry, pInfoAry, nOldSize );
-@@ -218,8 +220,10 @@ void ImplImageBmp::Replace( USHORT nPos,
- {
- aMask.CopyPixel( aDstRect, aSrcRect );
-
-- if( !!aDisa )
-+ if( !!aDisa ) {
- aDisa.CopyPixel( aDstRect, aSrcRect );
-+ aDisaMask.CopyPixel( aDstRect, aSrcRect );
-+ }
- }
-
- pInfoAry[ nPos ] = pInfoAry[ nSrcPos ];
-@@ -241,8 +245,10 @@ void ImplImageBmp::Replace( USHORT nPos,
- {
- aMask.CopyPixel( aDstRect, aSrcRect, &rImageBmp.aMask );
-
-- if( !!aDisa )
-+ if( !!aDisa ) {
- aDisa.CopyPixel( aDstRect, aSrcRect, &rImageBmp.aDisa );
-+ aDisaMask.CopyPixel( aDstRect, aSrcRect, &rImageBmp.aDisa );
-+ }
- }
-
- pInfoAry[ nPos ] = rImageBmp.pInfoAry[ nSrcPos ];
-@@ -299,7 +305,10 @@ void ImplImageBmp::ReplaceColors( const
- ClearCaches();
-
- if( !aDisa.IsEmpty() )
-+ {
- aDisa.SetEmpty();
-+ aDisaMask.SetEmpty();
-+ }
-
- aBmp.Replace( pSrcColors, pDstColors, nColorCount );
- }
-@@ -395,7 +404,9 @@ BOOL ImplImageBmp::HasMaskBitmap() const
-
- Bitmap ImplImageBmp::GetMaskBitmap( USHORT nPosCount, USHORT* pPosAry ) const
- {
-- Bitmap aNewMask( Size( nPosCount * aSize.Width(), aSize.Height() ), aMask.GetBitCount() );
-+ Bitmap aNewMask( Size( nPosCount * aSize.Width(), aSize.Height() ),
-+ aMask.GetBitCount(),
-+ aMask.GetBitCount() > 1 ? &Bitmap::GetGreyPalette( 256 ) : NULL );
-
- for( USHORT i = 0; i < nPosCount; i++ )
- {
-@@ -482,7 +493,11 @@ void ImplImageBmp::Draw( USHORT nPos, Ou
-
- if( !aDisa )
- {
-- aDisa = Bitmap( aBmpEx.GetSizePixel(), 1 );
-+ aDisa = Bitmap( aBmpEx.GetSizePixel(), aBmpEx.GetBitCount() );
-+ if( aBmpEx.GetMask().GetBitCount() == 1 )
-+ aDisaMask = Bitmap( aBmpEx.GetSizePixel(), 1 );
-+ else
-+ aDisaMask = Bitmap( aBmpEx.GetSizePixel(), 8, &Bitmap::GetGreyPalette( 256 ) );
- ImplUpdateDisaBmp( DISA_ALL );
- #ifndef REMOTE_APPSERVER
- aDisaDisp = aDisa.CreateDisplayBitmap( pOutDev );
-@@ -494,10 +509,18 @@ void ImplImageBmp::Draw( USHORT nPos, Ou
- if( !aDisaDisp && !!aDisa )
- aDisaDisp = aDisa.CreateDisplayBitmap( pOutDev );
-
-- pOutDev->DrawMask( aOutPos1, aOutSize, aPos, aSize,
-- aDisaDisp, rSettings.GetLightColor() );
-- pOutDev->DrawMask( aOutPos, aOutSize, aPos, aSize,
-- aDisaDisp, rSettings.GetShadowColor() );
-+ if (aDisaDisp.GetBitCount() == 1)
-+ { // A mask
-+ pOutDev->DrawMask( aOutPos1, aOutSize, aPos, aSize,
-+ aDisaDisp, rSettings.GetLightColor() );
-+ pOutDev->DrawMask( aOutPos, aOutSize, aPos, aSize,
-+ aDisaDisp, rSettings.GetShadowColor() );
-+ }
-+ else
-+ {
-+ BitmapEx tBmpEx( aDisa, aDisaMask );
-+ pOutDev->DrawBitmapEx( aOutPos, aOutSize, aPos, aSize, tBmpEx );
-+ }
- }
- else
- {
-@@ -505,9 +528,10 @@ void ImplImageBmp::Draw( USHORT nPos, Ou
-
- if( nStyle & ( IMAGE_DRAW_COLORTRANSFORM | IMAGE_DRAW_HIGHLIGHT | IMAGE_DRAW_DEACTIVE | IMAGE_DRAW_SEMITRANSPARENT ) )
- {
-+
- Bitmap aTmpBmp( aBmp ), aTmpMsk( aMask );
- const Rectangle aCropRect( aPos, aSize );
--
-+
- aTmpBmp.Crop( aCropRect );
- aTmpMsk.Crop( aCropRect );
-
-@@ -607,11 +631,8 @@ void ImplImageBmp::Draw( USHORT nPos, Ou
- aTmpMsk.Convert( BMP_CONVERSION_8BIT_GREYS );
- aTmpMsk.Adjust( 50 );
- }
--
-- aTmpBmpEx = BitmapEx( aTmpBmp, AlphaMask( aTmpMsk ) );
- }
-- else
-- aTmpBmpEx = BitmapEx( aTmpBmp, aTmpMsk );
-+ aTmpBmpEx = BitmapEx( aTmpBmp, aTmpMsk );
-
- pOutDev->DrawBitmapEx( aOutPos, aTmpBmpEx );
- bDrawn = TRUE;
-@@ -651,6 +672,7 @@ void ImplImageBmp::ImplUpdateDisaBmp( US
- BitmapReadAccess* pAcc = aBmp.AcquireReadAccess();
- BitmapReadAccess* pMsk = aMask.AcquireReadAccess();
- BitmapWriteAccess* pDis = aDisa.AcquireWriteAccess();
-+ BitmapWriteAccess* pDisMask = aDisaMask.AcquireWriteAccess();
-
- if( pAcc && pMsk && pDis )
- {
-@@ -741,22 +763,52 @@ void ImplImageBmp::ImplUpdateDisaBmp( US
- }
- }
- }
-- else
-- {
-+ else if (pAcc->GetBitCount() == 32)
-+ {
-+ for( long nX = nCurLeft; nX < nCurRight; nX++ )
-+ {
- for( long nY = nTop; nY < nBottom; nY++ )
- {
-- for( long nX = nCurLeft; nX < nCurRight; nX++ )
-- {
-- if( ( aMskWhite == pMsk->GetPixel( nY, nX ) ) ||
-- ( aAccWhite == pAcc->GetPixel( nY, nX ) ) )
-+ BitmapColor col = pAcc->GetPixel( nY, nX );
-+
-+ if ((nY + nX) % 2 == 0)
- {
-- pDis->SetPixel( nY, nX, aDisWhite );
-+ unsigned char i;
-+ i = ( col.GetRed() * 0.3 + // magic numbers from gdk-pixbuf
-+ col.GetGreen() * 0.59 +
-+ col.GetBlue () * 0.11 );
-+
-+ col.SetRed (i / 2 + 127);
-+ col.SetGreen (i / 2 + 127);
-+ col.SetBlue (i / 2 + 127);
- }
- else
- {
-- pDis->SetPixel( nY, nX, aDisBlack );
-- ++nBlackCount;
-+#define GT_ZERO(c) (((c) >= 0) ? c : 0)
-+ col.SetRed (GT_ZERO (( col.GetRed ()) * 0.7));
-+ col.SetGreen (GT_ZERO (( col.GetGreen ()) * 0.7));
-+ col.SetBlue (GT_ZERO (( col.GetBlue ()) * 0.7));
-+#undef GT_ZERO
- }
-+ pDis->SetPixel( nY, nX, col );
-+ // The way the mask is polarised is most strange
-+ BYTE nAlpha = 255 - (BYTE)pMsk->GetPixel( nY, nX );
-+ pDisMask->SetPixel( nY, nX, BitmapColor( 255 - (nAlpha / 2) ) );
-+ }
-+ }
-+ nBlackCount = nBlackThreshold;
-+ }
-+ else
-+ {
-+ for( long nY = nTop; nY < nBottom; nY++ )
-+ {
-+ for( long nX = nCurLeft; nX < nCurRight; nX++ )
-+ {
-+ if( ( aMskWhite == pMsk->GetPixel( nY, nX ) ) &&
-+ ( aAccWhite != pAcc->GetPixel( nY, nX ) ) )
-+ pDis->SetPixel( nY, nX, aDisBlack );
-+ else
-+ pDis->SetPixel( nY, nX, aDisWhite );
- }
- }
- }
-@@ -784,6 +836,7 @@ void ImplImageBmp::ImplUpdateDisaBmp( US
- aBmp.ReleaseAccess( pAcc );
- aMask.ReleaseAccess( pMsk );
- aDisa.ReleaseAccess( pDis );
-+ aDisa.ReleaseAccess( pDisMask );
- }
-
- // -----------------------------------------------------------------------
+++ /dev/null
---- vcl/source/window/menu-checkbox-off.xpm Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-checkbox-off.xpm Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,12 @@
-+/* XPM */
-+static char * menu_checkbox_off_xpm[] = {
-+"8 8 1 1",
-+" c None",
-+" ",
-+" ",
-+" ",
-+" ",
-+" ",
-+" ",
-+" ",
-+" "};
---- vcl/source/window/menu-checkbox-on.xpm Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-checkbox-on.xpm Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,16 @@
-+/* XPM */
-+static char * menu_checkbox_on_xpm[] = {
-+"8 8 5 1",
-+" c None",
-+"+ c #DEDEDE",
-+"@ c #000000",
-+"# c #989898",
-+"$ c #C9C9C9",
-+" ",
-+" ",
-+" +@#",
-+"+@+ +@@+",
-+"@@@$@@+ ",
-+"+@@@@+ ",
-+" +@@+ ",
-+" "};
---- vcl/source/window/menu-radio-off.xpm Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-radio-off.xpm Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,18 @@
-+/* XPM */
-+static char * menu_radio_off_xpm[] = {
-+"8 8 7 1",
-+" c None",
-+". c #FDFDFD",
-+"+ c #CDCDCD",
-+"@ c #4F4F4F",
-+"# c #0A0A0A",
-+"$ c #D3D3D3",
-+"% c #FEFEFE",
-+" +@##@+ ",
-+"+#$%%$#+",
-+"@$....$@",
-+"#%....%#",
-+"#%....%#",
-+"@$....$@",
-+"+#$%%$#+",
-+" +@##@+ "};
---- vcl/source/window/menu-radio-on.xpm Thu Apr 11 09:25:15 2002
-+++ vcl/source/window/menu-radio-on.xpm Thu Apr 10 19:47:09 2003
-@@ -0,0 +1,20 @@
-+/* XPM */
-+static char * menu_radio_on_xpm[] = {
-+"8 8 9 1",
-+" c None",
-+"+ c #CDCDCD",
-+"@ c #4F4F4F",
-+"# c #0A0A0A",
-+"$ c #D3D3D3",
-+"% c #FEFEFE",
-+"& c #9F9F9F",
-+"* c #151515",
-+"= c #000000",
-+" +@##@+ ",
-+"+#$%%$#+",
-+"@$&**&$@",
-+"#%*==*%#",
-+"#%*==*%#",
-+"@$&**&$@",
-+"+#$%%$#+",
-+" +@##@+ "};
+++ /dev/null
-Index: vcl/source/window/menu.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/menu.cxx,v
-retrieving revision 1.96
-diff -u -p -u -r1.96 menu.cxx
---- vcl/source/window/menu.cxx 12 Jun 2003 07:51:30 -0000 1.96
-+++ vcl/source/window/menu.cxx 6 Aug 2003 16:44:44 -0000
-@@ -171,6 +171,339 @@
-
- #include <map>
-
-+
-+#include <ctype.h>
-+#include <stdio.h>
-+
-+#include <salbtype.hxx>
-+#include <bmpacc.hxx>
-+
-+#include "menu-checkbox-off.xpm"
-+#include "menu-checkbox-on.xpm"
-+#include "menu-radio-off.xpm"
-+#include "menu-radio-on.xpm"
-+
-+static void
-+rgb_to_hls (double *r,
-+ double *g,
-+ double *b)
-+{
-+ double min;
-+ double max;
-+ double red;
-+ double green;
-+ double blue;
-+ double h, l, s;
-+ double delta;
-+
-+ red = *r;
-+ green = *g;
-+ blue = *b;
-+
-+ if (red > green) {
-+ if (red > blue)
-+ max = red;
-+ else
-+ max = blue;
-+
-+ if (green < blue)
-+ min = green;
-+ else
-+ min = blue;
-+ } else {
-+ if (green > blue)
-+ max = green;
-+ else
-+ max = blue;
-+
-+ if (red < blue)
-+ min = red;
-+ else
-+ min = blue;
-+ }
-+
-+ l = (max + min) / 2;
-+ s = 0;
-+ h = 0;
-+
-+ if (max != min) {
-+ if (l <= 0.5)
-+ s = (max - min) / (max + min);
-+ else
-+ s = (max - min) / (2 - max - min);
-+
-+ delta = max -min;
-+ if (red == max)
-+ h = (green - blue) / delta;
-+ else if (green == max)
-+ h = 2 + (blue - red) / delta;
-+ else if (blue == max)
-+ h = 4 + (red - green) / delta;
-+
-+ h *= 60;
-+ if (h < 0.0)
-+ h += 360;
-+ }
-+
-+ *r = h;
-+ *g = l;
-+ *b = s;
-+}
-+
-+static void
-+hls_to_rgb (double *h,
-+ double *l,
-+ double *s)
-+{
-+ double hue;
-+ double lightness;
-+ double saturation;
-+ double m1, m2;
-+ double r, g, b;
-+
-+ lightness = *l;
-+ saturation = *s;
-+
-+ if (lightness <= 0.5)
-+ m2 = lightness * (1 + saturation);
-+ else
-+ m2 = lightness + saturation - lightness * saturation;
-+ m1 = 2 * lightness - m2;
-+
-+ if (saturation == 0) {
-+ *h = lightness;
-+ *l = lightness;
-+ *s = lightness;
-+ } else {
-+ hue = *h + 120;
-+ while (hue > 360)
-+ hue -= 360;
-+ while (hue < 0)
-+ hue += 360;
-+
-+ if (hue < 60)
-+ r = m1 + (m2 - m1) * hue / 60;
-+ else if (hue < 180)
-+ r = m2;
-+ else if (hue < 240)
-+ r = m1 + (m2 - m1) * (240 - hue) / 60;
-+ else
-+ r = m1;
-+
-+ hue = *h;
-+ while (hue > 360)
-+ hue -= 360;
-+ while (hue < 0)
-+ hue += 360;
-+
-+ if (hue < 60)
-+ g = m1 + (m2 - m1) * hue / 60;
-+ else if (hue < 180)
-+ g = m2;
-+ else if (hue < 240)
-+ g = m1 + (m2 - m1) * (240 - hue) / 60;
-+ else
-+ g = m1;
-+
-+ hue = *h - 120;
-+ while (hue > 360)
-+ hue -= 360;
-+ while (hue < 0)
-+ hue += 360;
-+
-+ if (hue < 60)
-+ b = m1 + (m2 - m1) * hue / 60;
-+ else if (hue < 180)
-+ b = m2;
-+ else if (hue < 240)
-+ b = m1 + (m2 - m1) * (240 - hue) / 60;
-+ else
-+ b = m1;
-+
-+ *h = r;
-+ *l = g;
-+ *s = b;
-+ }
-+}
-+
-+/* Does some weird shading from the bg and fg colors and puts the result in (ir, ig, ib) */
-+static void
-+shade_rgb (int *ir, int *ig, int *ib, const Color &fg_color, const Color &bg_color, double value)
-+{
-+ double r, g, b;
-+ double f_r, f_g, f_b;
-+
-+ r = bg_color.GetRed () / 255.0;
-+ g = bg_color.GetGreen () / 255.0;
-+ b = bg_color.GetBlue () / 255.0;
-+
-+ f_r = fg_color.GetRed () / 255.0;
-+ f_g = fg_color.GetGreen () / 255.0;
-+ f_b = fg_color.GetBlue () / 255.0;
-+
-+ rgb_to_hls (&r, &g, &b);
-+ rgb_to_hls (&f_r, &f_g, &f_b);
-+
-+ /* now green is the lightness */
-+
-+ g = (g - f_g) * value + f_g;
-+ if (g > 1.0)
-+ g = 1.0;
-+ else if (g < 0.0)
-+ g = 0.0;
-+
-+ hls_to_rgb (&r, &g, &b);
-+
-+ *ir = (r * 255.0) + 0.5;
-+ *ig = (g * 255.0) + 0.5;
-+ *ib = (b * 255.0) + 0.5;
-+}
-+
-+/* Takes a grayscale XPM and shades it into a Bitmap */
-+static Bitmap *
-+create_shaded_bitmap (char **xpm, const Color &fg_color, const Color &bg_color)
-+{
-+ char *line;
-+ int width, height, n_colors, color_len;
-+ int palette[256]; /* 0xRRGGBBAA */
-+ Bitmap *bitmap;
-+ BitmapWriteAccess *wa;
-+ int i;
-+ int y;
-+ int br, bg, bb;
-+
-+ line = xpm[0];
-+
-+ if (sscanf (line, "%d%d%d%d", &width, &height, &n_colors, &color_len) != 4)
-+ return NULL;
-+
-+ if (color_len != 1)
-+ return NULL;
-+
-+ /* Read the palette */
-+
-+ for (i = 0; i < 256; i++)
-+ palette[i] = 0;
-+
-+ for (i = 0; i < n_colors; i++) {
-+ char *p;
-+ int color_id;
-+ int color;
-+ BOOL is_transparent;
-+
-+ line = xpm[i + 1];
-+ p = line;
-+
-+ color_id = *p++;
-+
-+ while (*p && isspace (*p))
-+ p++;
-+
-+ if (*p != 'c')
-+ return NULL;
-+
-+ p++;
-+
-+ while (*p && isspace (*p))
-+ p++;
-+
-+ color = 0;
-+ is_transparent = TRUE;
-+
-+ if (*p == '#') {
-+ p++;
-+ is_transparent = FALSE;
-+
-+ while (*p) {
-+ color = (color << 4);
-+
-+ if (*p >= '0' && *p <= '9')
-+ color += *p - '0';
-+ else if (*p >= 'A' && *p <= 'Z')
-+ color += *p - 'A' + 10;
-+ else
-+ break;
-+
-+ p++;
-+ }
-+ }
-+
-+ color = color << 8;
-+ if (!is_transparent)
-+ color = color | 0xFF;
-+
-+ palette[color_id] = color;
-+ }
-+
-+ /* Create the bitmap */
-+
-+ bitmap = new Bitmap (Size (width, height), 24);
-+ if (!bitmap)
-+ return NULL;
-+
-+ wa = bitmap->AcquireWriteAccess ();
-+ if (!wa) {
-+ delete bitmap;
-+ return NULL;
-+ }
-+
-+ br = bg_color.GetRed ();
-+ bg = bg_color.GetGreen ();
-+ bb = bg_color.GetBlue ();
-+
-+ for (y = 0; y < height; y++) {
-+ int x;
-+
-+ line = xpm[y + n_colors + 1];
-+
-+ for (x = 0; x < width; x++) {
-+ int color;
-+ double gray;
-+ int r, g, b, a;
-+ int tmp;
-+
-+ color = palette[line[x]];
-+ gray = ((color & 0xFF00) >> 8) / 254.0; /* who knows why that is the maximum value in the files */
-+ a = color & 0xFF;
-+
-+ shade_rgb (&r, &g, &b, fg_color, bg_color, gray);
-+
-+ tmp = (r - br) * a;
-+ r = br + ((tmp + (tmp >> 8) + 0x80) >> 8);
-+
-+ tmp = (g - bg) * a;
-+ g = bg + ((tmp + (tmp >> 8) + 0x80) >> 8);
-+
-+ tmp = (b - bb) * a;
-+ b = bb + ((tmp + (tmp >> 8) + 0x80) >> 8);
-+
-+ wa->SetPixel (y, x, BitmapColor (r, g, b));
-+ }
-+ }
-+
-+ bitmap->ReleaseAccess (wa);
-+
-+ return bitmap;
-+}
-+
-+/* Generates the appropriate image for a check or radio menu item */
-+static Bitmap *
-+create_option_bitmap (BOOL is_radio, BOOL is_active, const Color &fg_color, const Color &bg_color)
-+{
-+ static char **xpms[] = {
-+ menu_checkbox_off_xpm,
-+ menu_checkbox_on_xpm,
-+ menu_radio_off_xpm,
-+ menu_radio_on_xpm
-+ };
-+
-+ char **xpm;
-+
-+ xpm = xpms[(is_radio ? 2 : 0) | (is_active ? 1 : 0)];
-+
-+ return create_shaded_bitmap (xpm, fg_color, bg_color);
-+}
-+
- namespace vcl
- {
-
-@@ -2093,6 +2435,7 @@ void Menu::ImplPaint( Window* pWin, USHO
- }
-
- // CheckMark
-+#if 0
- if ( !bLayout && !bIsMenuBar && pData->bChecked )
- {
- Rectangle aRect;
-@@ -2116,6 +2459,37 @@ void Menu::ImplPaint( Window* pWin, USHO
- }
- aDecoView.DrawSymbol( aRect, eSymbol, pWin->GetTextColor(), nSymbolStyle );
- }
-+#endif
-+ if ( !bIsMenuBar
-+ && !pData->pSubMenu
-+ && ( pData->bChecked || (pData->nBits & (MIB_RADIOCHECK | MIB_CHECKABLE | MIB_AUTOCHECK)) ) )
-+ {
-+ Bitmap *bitmap;
-+ BOOL is_radio;
-+ BOOL is_active;
-+ const StyleSettings &settings = pWin->GetSettings().GetStyleSettings();
-+
-+ is_radio = (pData->nBits & MIB_RADIOCHECK) != 0;
-+ is_active = pData->bChecked;
-+
-+ bitmap = create_option_bitmap (is_radio,
-+ is_active,
-+ settings.GetMenuTextColor (),
-+ pWin->GetFillColor ());
-+
-+ if (bitmap) {
-+ Point p;
-+ int text_yofs;
-+
-+ text_yofs = (pData->aSz.Height() - nFontHeight) / 2;
-+
-+ p.X () = aPos.X () + nCheckPos;
-+ p.Y () = aPos.Y () + text_yofs + nFontHeight / 2 - bitmap->GetSizePixel ().Height () / 2;
-+
-+ pWin->DrawBitmap (p, *bitmap);
-+ delete bitmap;
-+ }
-+ }
-
- // SubMenu?
- if ( !bLayout && !bIsMenuBar && pData->pSubMenu )
+++ /dev/null
-Index: sw/source/ui/inc/swmn.hrc
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/inc/swmn.hrc,v
-retrieving revision 1.133.34.1
-diff -u -r1.133.34.1 swmn.hrc
---- sw/source/ui/inc/swmn.hrc 25 Aug 2003 13:34:46 -0000 1.133.34.1
-+++ sw/source/ui/inc/swmn.hrc 14 Nov 2003 11:13:24 -0000
-@@ -5207,6 +5207,8 @@
- {
- Identifier = FN_EDIT_FORMULA ;
- HelpID = FN_EDIT_FORMULA ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "~Rechenleiste" ;
- Text [ english_us ] = "Fo~rmula Bar" ;
- Text[ portuguese ] = "Fo~rmularbar";
-@@ -5390,6 +5392,8 @@
- {
- Identifier = FN_VIEW_MARKS ;
- HelpID = FN_VIEW_MARKS ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "Ma~rkierungen" ;
- Text [ English ] = "~Marks" ;
- Text [ norwegian ] = "~Merker" ;
-@@ -5427,6 +5431,8 @@
- {
- Identifier = FN_VIEW_FIELDNAME ;
- HelpID = FN_VIEW_FIELDNAME ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "~Feldbefehle" ;
- Text [ English ] = "~Fields" ;
- Text [ norwegian ] = "~Felter" ;
-@@ -5464,6 +5470,8 @@
- {
- Identifier = FN_VIEW_META_CHARS ;
- HelpID = FN_VIEW_META_CHARS ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "Steuer~zeichen" ;
- Text [ English ] = "~Control codes" ;
- Text [ norwegian ] = "~Kontroller koder" ;
-@@ -5545,6 +5553,8 @@
- {
- Identifier = FN_PRINT_LAYOUT ;
- HelpID = FN_PRINT_LAYOUT ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "~Druck - Layout" ;
- Text [ English ] = "~Print layout" ;
- Text [ portuguese ] = "~Configuração da impressão" ;
-@@ -7574,6 +7584,8 @@
- {
- Identifier = SID_AUTOSPELL_CHECK ;
- HelpID = SID_AUTOSPELL_CHECK ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- /* ### ACHTUNG: Neuer Text in Resource? ~Automatisch prĂŒfen : ~Automatisch prÂłfen */
- Text = "~Automatisch prĂŒfen" ;
- Text [ English ] = "~Online spelling" ;
-Index: sd/source/ui/app/menuids.src
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/menuids.src,v
-retrieving revision 1.49
-diff -u -r1.49 menuids.src
---- sd/source/ui/app/menuids.src 17 Jul 2003 12:39:55 -0000 1.49
-+++ sd/source/ui/app/menuids.src 14 Nov 2003 11:13:25 -0000
-@@ -3739,6 +3739,8 @@
- {\
- Identifier = SID_GRID_VISIBLE ; \
- HelpID = SID_GRID_VISIBLE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Raster sichtbar" ; \
- Text [ ENGLISH ] = "Grid visible" ; \
- Text [ dutch ] = "Raster ~zichtbaar" ; \
-@@ -3774,6 +3776,8 @@
- {\
- Identifier = SID_GRID_USE ; \
- HelpID = SID_GRID_USE; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Am Raster fangen"; \
- Text [ ENGLISH ] = "Snap to grid"; \
- Text[ english_us ] = "Snap to Grid"; \
-@@ -3888,6 +3892,8 @@
- {\
- Identifier = SID_HELPLINES_VISIBLE ; \
- HelpID = SID_HELPLINES_VISIBLE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- /* ### ACHTUNG: Neuer Text in Resource? ~Fanglinien sichtbar : ~Hilfslinien sichtbar */\
- Text = "~Fanglinien sichtbar" ; \
- Text [ ENGLISH ] = "Helplines visible" ; \
-@@ -3924,6 +3930,8 @@
- {\
- Identifier = SID_HELPLINES_USE ; \
- HelpID = SID_HELPLINES_USE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~An Fanglinien fangen"; \
- Text [ english ] = "Snap to Guides"; \
- Text[ english_us ] = "Snap to Snap Lines"; \
-@@ -4460,6 +4468,8 @@
- {\
- Identifier = SID_OBJECT_ROTATE ; \
- HelpID = SID_OBJECT_ROTATE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Drehen" ; \
- Text [ ENGLISH ] = "~Rotate" ; \
- Text[ english_us ] = "~Rotate";\
-@@ -4635,6 +4645,8 @@
- {\
- Identifier = SID_BEZIER_EDIT ; \
- HelpID = SID_BEZIER_EDIT ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "Pu~nkte" ; \
- Text [ ENGLISH ] = "Poi~nts" ; \
- Text[ english_us ] = "Poi~nts";\
-@@ -4669,6 +4681,8 @@
- {\
- Identifier = SID_GLUE_EDITMODE ; \
- HelpID = SID_GLUE_EDITMODE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Klebepunkte"; \
- Text[ ENGLISH ] = "Glue Points"; \
- Text[ english_us ] = "~Glue Points";\
-Index: sd/source/ui/app/menuids2.src
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/menuids2.src,v
-retrieving revision 1.62
-diff -u -r1.62 menuids2.src
---- sd/source/ui/app/menuids2.src 17 Jul 2003 12:40:07 -0000 1.62
-+++ sd/source/ui/app/menuids2.src 14 Nov 2003 11:13:25 -0000
-@@ -618,6 +618,8 @@
- {\
- Identifier = SID_TOGGLECOMMONTASKBAR ; \
- HelpID = SID_TOGGLECOMMONTASKBAR ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "PrÀ~sentation" ; \
- Text [ ENGLISH ] = "~Presentation" ; \
- Text [ portuguese ] = "Apre~sentação" ; \
-@@ -2375,6 +2377,8 @@
- {\
- Identifier = SID_AUTOSPELL_CHECK ; \
- HelpID = SID_AUTOSPELL_CHECK ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Automatisch prĂŒfen" ; \
- Text [ English ] = "~Online spelling" ; \
- Text [ dutch ] = "~Automatisch controleren" ; \
-@@ -2409,6 +2413,8 @@
- {\
- Identifier = SID_THESAURUS ; \
- HelpID = SID_THESAURUS ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "T~hesaurus..." ; \
- Text [ English ] = "~Thesaurus..." ; \
- Text [ norwegian ] = "~Synonymordlister..." ; \
-@@ -2444,6 +2450,8 @@
- {\
- Identifier = SID_HYPHENATION ; \
- HelpID = SID_HYPHENATION ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "Silben~trennung" ; \
- Text [ English ] = "~Hyphenation" ; \
- Text [ english_us ] = "~Hyphenation" ; \
-@@ -2582,6 +2590,8 @@
- {\
- Identifier = SID_ANIMATION_OBJECTS ; \
- HelpID = SID_ANIMATION_OBJECTS ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Animation" ; \
- Text [ ENGLISH ] = "~Animation" ; \
- Text [ norwegian ] = "~Animation" ; \
-@@ -2617,6 +2627,8 @@
- {\
- Identifier = SID_EFFECT_WIN ; \
- HelpID = SID_EFFECT_WIN ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "E~ffekt" ; \
- Text [ ENGLISH ] = "~Effect" ; \
- Text [ english_us ] = "~Effects" ; \
-@@ -2651,6 +2663,8 @@
- {\
- Identifier = SID_ANIMATION_EFFECTS ; \
- HelpID = SID_ANIMATION_EFFECTS ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Interaktion..." ; \
- Text [ ENGLISH ] = "~Action..." ; \
- Text [ english_us ] = "~Interaction..." ; \
-@@ -2968,6 +2982,8 @@
- {\
- Identifier = SID_GALLERY; \
- HelpID = SID_GALLERY; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Gallery" ; \
- Text [ ENGLISH ] = "~Gallery" ; \
- Text [ english_us ] = "~Gallery" ; \
-Index: sd/source/ui/app/menuids3.src
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/menuids3.src,v
-retrieving revision 1.41
-diff -u -r1.41 menuids3.src
---- sd/source/ui/app/menuids3.src 17 Jul 2003 12:40:18 -0000 1.41
-+++ sd/source/ui/app/menuids3.src 14 Nov 2003 11:13:25 -0000
-@@ -491,6 +491,8 @@
- {\
- Identifier = SID_HIDE_SLIDE ; \
- HelpID = SID_HIDE_SLIDE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Dia anzeigen" ; \
- Text [ ENGLISH ] = "Show slide" ; \
- Text [ norwegian ] = "Show slide" ; \
-Index: sc/source/ui/src/menue.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/src/menue.src,v
-retrieving revision 1.104
-diff -u -r1.104 menue.src
---- sc/source/ui/src/menue.src 17 Jul 2003 12:56:00 -0000 1.104
-+++ sc/source/ui/src/menue.src 14 Nov 2003 11:13:26 -0000
-@@ -2847,6 +2847,8 @@
- {
- Identifier = SID_AUTOSPELL_CHECK ;
- HelpID = SID_AUTOSPELL_CHECK ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "~Automatisch prĂŒfen" ;
- Text [ English ] = "~Online spelling" ;
- Text [ english_us ] = "~AutoSpellcheck" ;
-@@ -2899,6 +2901,8 @@
- {
- Identifier = SID_THESAURUS ;
- HelpId = SID_THESAURUS ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "T~hesaurus..." ;
- Text [ English ] = "~Thesaurus..." ;
- Text [ norwegian ] = "~Synonymordlister..." ;
-@@ -7319,6 +7323,8 @@
- {
- Identifier = SID_AUTOSPELL_CHECK ;
- HelpID = SID_AUTOSPELL_CHECK ;
-+ _MenuItemFlags = MIB_CHECKABLE;
-+ Checkable = TRUE;
- Text = "~Automatisch prĂŒfen" ;
- Text [ English ] = "~Online spelling" ;
- Text [ english_us ] = "~AutoSpellcheck" ;
-Index: svx/inc/globlmn.hrc
-===================================================================
-RCS file: /cvs/graphics/svx/inc/globlmn.hrc,v
-retrieving revision 1.123
-diff -u -r1.123 globlmn.hrc
---- svx/inc/globlmn.hrc 22 Jul 2003 16:35:38 -0000 1.123
-+++ svx/inc/globlmn.hrc 14 Nov 2003 11:13:27 -0000
-@@ -208,6 +208,8 @@
- Identifier = SID_STYLE_DESIGNER ; \
- Command = ".uno:DesignerDialog" ; \
- HelpID = SID_STYLE_DESIGNER ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "St~ylist" ; \
- Text [ English ] = "St~ylist" ; \
- Text [ english_us ] = "St~ylist" ; \
-@@ -2783,6 +2785,8 @@
- Identifier = SID_NAVIGATOR ; \
- Command = ".uno:Navigator" ; \
- HelpID = SID_NAVIGATOR ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- TEXT = "~Navigator" ; \
- TEXT [ English ] = "~Navigator" ; \
- TEXT [ norwegian ] = "~Navigeringsvindu" ; \
-@@ -2852,6 +2856,8 @@
- Identifier = SID_PLUGINS_ACTIVE ; \
- Command = ".uno:PlugInsActive" ; \
- HelpID = SID_PLUGINS_ACTIVE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~PlugIn" ; \
- Text [ English ] = "PlugIn" ; \
- Text [ english_us ] = "P~lug-in" ; \
-@@ -2887,6 +2893,8 @@
- Identifier = SID_IMAP ; \
- Command = ".uno:ImageMapDialog" ; \
- HelpID = SID_IMAP ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "I~mageMap" ; \
- Text [ English ] = "ImageMap" ; \
- Text [ english_us ] = "ImageMap" ; \
-@@ -3315,6 +3323,8 @@
- Identifier = SID_BROWSER_MODE ; \
- Command = ".uno:BrowseView" ; \
- HelpID = SID_BROWSER_MODE ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Online-Layout" ; \
- Text [ ENGLISH ] = "~Online layout" ; \
- Text [ english_us ] = "~Online Layout" ; \
-@@ -3420,6 +3430,8 @@
- Identifier = SID_HYPERLINK_INSERT ; \
- Command = ".uno:InsertHyperlink" ; \
- HelpID = SID_HYPERLINK_INSERT ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "H~yperlinkleiste" ; \
- Text [ English ] = "H~yperlinkleiste" ; \
- Text [ english_us ] = "~Hyperlink Bar" ; \
-@@ -3647,6 +3659,8 @@
- Identifier = SID_GALLERY ; \
- Command = ".uno:Gallery" ; \
- HelpID = SID_GALLERY ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "Ga~llery" ; \
- Text [ ENGLISH ] = "Ga~llery" ; \
- Text [ english_us ] = "~Gallery" ; \
-@@ -5151,6 +5165,8 @@
- Identifier = SID_HELP_PI ; \
- Command = ".uno:HelperDialog" ; \
- HelpID = SID_HELP_PI ; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- TEXT = "He~lp Agent" ; \
- TEXT [ English ] = "He~lp Agent" ; \
- Text [ english_us ] = "Help ~Agent" ; \
-@@ -5723,6 +5739,8 @@
- Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \
- Command = ".uno:ViewDataSourceBrowser" ; \
- HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \
-+ _MenuItemFlags = MIB_CHECKABLE; \
-+ Checkable = TRUE; \
- Text = "~Datenquellen" ; \
- Text [ english ] = "~Data source browser" ; \
- Text [ english_us ] = "~Data Sources" ; \
+++ /dev/null
-Index: vcl/inc/menu.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/menu.hxx,v
-retrieving revision 1.26
-diff -u -p -u -r1.26 menu.hxx
---- vcl/inc/menu.hxx 24 Apr 2003 16:29:29 -0000 1.26
-+++ vcl/inc/menu.hxx 20 May 2003 11:37:16 -0000
-@@ -139,9 +139,10 @@ typedef USHORT MenuItemBits;
- #define MIB_HELP ((MenuItemBits)0x0010)
- #define MIB_POPUPSELECT ((MenuItemBits)0x0020)
-
--#define MENU_FLAG_NOAUTOMNEMONICS 0x0001
--#define MENU_FLAG_HIDEDISABLEDENTRIES 0x0002
--
-+#define MENU_FLAG_NOAUTOMNEMONICS 0x0001
-+#define MENU_FLAG_HIDEDISABLEDENTRIES 0x0002
-+#define MENU_FLAG_SHOWCHECKIMAGES 0x0004
-+
- // --------
- // - Menu -
- // --------
-Index: sfx2/source/toolbox/tbxchild.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/toolbox/tbxchild.cxx,v
-retrieving revision 1.33
-diff -u -p -u -r1.33 tbxchild.cxx
---- sfx2/source/toolbox/tbxchild.cxx 4 Apr 2003 17:38:56 -0000 1.33
-+++ sfx2/source/toolbox/tbxchild.cxx 20 May 2003 11:38:20 -0000
-@@ -940,6 +940,9 @@ void SfxToolbox::Command ( const Command
- SfxUInt16Item aConfigItem ( SID_CONFIGITEMID, pMgr->GetType() );
- SfxUInt16Item *pItem = &aConfigItem;
-
-+ pItemMenu->SetMenuFlags (pItemMenu->GetMenuFlags () |
-+ MENU_FLAG_SHOWCHECKIMAGES);
-+
- Point aPoint( rCEvt.GetMousePosPixel() );
- USHORT nId = aPop.Execute( aPoint, this, (const SfxPoolItem*)pItem, 0L );
-
-Index: vcl/source/window/menu.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/menu.cxx,v
-retrieving revision 1.93
-diff -u -p -u -r1.93 menu.cxx
---- vcl/source/window/menu.cxx 24 Apr 2003 16:32:17 -0000 1.93
-+++ vcl/source/window/menu.cxx 20 May 2003 13:21:01 -0000
-@@ -1863,8 +1863,7 @@ Size Menu::ImplCalcSize( Window* pWin )
-
- Size aSz;
- Size aMaxImgSz;
-- long nMaxTextWidth = 0;
-- long nMaxAccWidth = 0;
-+ long nMaxWidth = 0;
- long nMinMenuItemHeight = nFontHeight;
-
- const StyleSettings& rSettings = pWin->GetSettings().GetStyleSettings();
-@@ -1895,6 +1894,7 @@ Size Menu::ImplCalcSize( Window* pWin )
-
- if ( ImplIsVisible( n ) )
- {
-+ long nWidth = 0;
-
- // Separator
- if ( !bIsMenuBar && ( pData->eType == MENUITEM_SEPARATOR ) )
-@@ -1919,8 +1919,6 @@ Size Menu::ImplCalcSize( Window* pWin )
- if ( (pData->eType == MENUITEM_STRING) || (pData->eType == MENUITEM_STRINGIMAGE) )
- {
- long nTextWidth = pWin->GetCtrlTextWidth( pData->aText );
-- if ( nTextWidth > nMaxTextWidth )
-- nMaxTextWidth = nTextWidth;
- long nTextHeight = pWin->GetTextHeight();
-
- // if ( nTextHeight > pData->aSz.Height() )
-@@ -1936,6 +1934,7 @@ Size Menu::ImplCalcSize( Window* pWin )
- }
- else
- pData->aSz.Height() = std::max( std::max( nTextHeight, pData->aSz.Height() ), nMinMenuItemHeight );
-+ nWidth += nTextWidth;
- }
-
- // Accel
-@@ -1944,15 +1943,14 @@ Size Menu::ImplCalcSize( Window* pWin )
- String aName = pData->aAccelKey.GetName();
- long nAccWidth = pWin->GetTextWidth( aName );
- nAccWidth += nExtra;
-- if ( nAccWidth > nMaxAccWidth )
-- nMaxAccWidth = nAccWidth;
-+ nWidth += nAccWidth;
- }
-
- // SubMenu?
- if ( !bIsMenuBar && pData->pSubMenu )
- {
-- if ( nFontHeight > nMaxAccWidth )
-- nMaxAccWidth = nFontHeight;
-+ if ( nFontHeight > nWidth )
-+ nWidth += nFontHeight;
-
- pData->aSz.Height() = std::max( std::max( nFontHeight, pData->aSz.Height() ), nMinMenuItemHeight );
-
-@@ -1964,20 +1962,26 @@ Size Menu::ImplCalcSize( Window* pWin )
-
- if ( !bIsMenuBar )
- aSz.Height() += (long)pData->aSz.Height();
-+
-+ if ( nWidth > nMaxWidth )
-+ nMaxWidth = nWidth;
- }
- }
-
- if ( !bIsMenuBar )
- {
-- USHORT gfxExtra = (USHORT) std::max( nExtra, 7L ); // #107710# increase space between checkmarks/images/text
-- nCheckPos = (USHORT)nExtra;
-- nImagePos = (USHORT)(nCheckPos + nFontHeight/2 + gfxExtra );
-- nTextPos = (USHORT)(nImagePos+aMaxImgSz.Width());
-+ int nCheckWidth = 0;
-+ if ((nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES) || aMaxImgSz.Width() <= 0)
-+ nCheckWidth = nFontHeight/2 + nExtra;
-+ USHORT gfxExtra = std::max( nExtra, 7L ); // #107710# increase space between checkmarks/images/text
-+ nCheckPos = nExtra;
-+ nImagePos = nCheckPos + nCheckWidth;
-+ nTextPos = nImagePos + aMaxImgSz.Width();
- if ( aMaxImgSz.Width() )
- nTextPos += gfxExtra;
-
-- aSz.Width() = nTextPos + nMaxTextWidth + nExtra + nMaxAccWidth;
-- aSz.Width() += 10*nExtra; // etwas mehr...
-+ aSz.Width() = nTextPos + nMaxWidth + nExtra;
-+ aSz.Width() += 4*nExtra; // a _little_ more ...
- }
- else
- {
-@@ -2057,10 +2061,15 @@ void Menu::ImplPaint( Window* pWin, USHO
- // Image:
- if ( !bLayout && !bIsMenuBar && ( ( pData->eType == MENUITEM_IMAGE ) || ( pData->eType == MENUITEM_STRINGIMAGE ) ) )
- {
-+ // Don't render an image for a check thing
-+ if ((nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES) ||
-+ (!(pData->nBits & (MIB_RADIOCHECK | MIB_CHECKABLE | MIB_AUTOCHECK)) && !pData->bChecked))
-+ {
- aTmpPos.Y() = aPos.Y();
- aTmpPos.X() = aPos.X() + nImagePos;
- aTmpPos.Y() += (pData->aSz.Height()-pData->aImage.GetSizePixel().Height())/2;
- pWin->DrawImage( aTmpPos, pData->aImage, nImageStyle );
-+ }
- }
-
- // Text:
-@@ -3973,6 +3982,7 @@ void MenuFloatingWindow::Paint( const Re
- ImplDrawScroller( TRUE );
- ImplDrawScroller( FALSE );
- }
-+ SetFillColor (GetSettings ().GetStyleSettings ().GetMenuColor ());
- pMenu->ImplPaint( this, nScrollerHeight, ImplGetStartY() );
- if ( nHighlightedItem != ITEMPOS_INVALID )
- HighlightItem( nHighlightedItem, TRUE );
-@@ -4604,6 +4614,7 @@ BOOL MenuBarWindow::ImplHandleKeyEvent(
-
- void MenuBarWindow::Paint( const Rectangle& rRect )
- {
-+ SetFillColor (GetSettings ().GetStyleSettings ().GetMenuColor ());
- pMenu->ImplPaint( this, 0 );
- if ( nHighlightedItem != ITEMPOS_INVALID )
- HighlightItem( nHighlightedItem, TRUE );
+++ /dev/null
-Index: sfx2/source/appl/app.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/app.src,v
-retrieving revision 1.85
-diff -u -p -u -r1.85 app.src
---- sfx2/source/appl/app.src 26 May 2003 08:28:00 -0000 1.85
-+++ sfx2/source/appl/app.src 4 Jun 2003 10:03:31 -0000
-@@ -3590,9 +3590,12 @@ ToolBox RID_ENVTOOLBOX
- SID_EXPLORER_SEARCHORIGINAL;\
- SID_EXPLORER_DETAILS;\
- SID_EXPLORER_ICONS;\
-- };\
-+ SID_HELPINDEX;\
-+ SID_HELP_SUPPORTPAGE;\
-+ SID_ABOUT;\
-+ };\
- IdCount = {\
-- 40;\
-+ 43;\
- };
-
- #ifndef IMAGE_STDBTN_COLOR
-Index: sw/source/ui/app/app.src
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/app/app.src,v
-retrieving revision 1.88
-diff -u -p -u -r1.88 app.src
---- sw/source/ui/app/app.src 26 May 2003 08:14:25 -0000 1.88
-+++ sw/source/ui/app/app.src 4 Jun 2003 10:04:39 -0000
-@@ -325,11 +325,13 @@ String STR_PAGE_COUNT_MACRO
- FN_INSERT_CAPTION;\
- FN_INSERT_REF_FIELD;\
- FN_INSERT_REGION;\
-- \
-+ SID_HELPINDEX;\
-+ SID_HELP_SUPPORTPAGE;\
-+ SID_ABOUT;\
- \
- }; \
- IdCount = { \
-- 165; \
-+ 168; \
- };
-
-
-Index: sc/source/ui/src/toolbox.src
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/src/toolbox.src,v
-retrieving revision 1.53
-diff -u -p -u -r1.53 toolbox.src
---- sc/source/ui/src/toolbox.src 26 May 2003 08:09:27 -0000 1.53
-+++ sc/source/ui/src/toolbox.src 4 Jun 2003 10:05:23 -0000
-@@ -1896,9 +1896,15 @@ FloatingWindow RID_TBXCTL_INSOBJ
- SID_ATTR_GRAF_CROP;\
- SID_ENABLE_HYPHENATION; /* 26087 */ \
- SID_ATTR_ZOOM; \
-+ SID_PRINTPREVIEW;\
-+ SID_HELPINDEX;\
-+ SID_HELP_SUPPORTPAGE;\
-+ SID_ABOUT;\
-+ SID_DELETE_CONTENTS;\
-+ SID_SELECTALL;\
- }; \
- IdCount = { \
-- 163; \
-+ 169; \
- };
-
-
-Index: sd/source/ui/app/app.src
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/app/app.src,v
-retrieving revision 1.20
-diff -u -p -u -r1.20 app.src
---- sd/source/ui/app/app.src 26 May 2003 08:08:02 -0000 1.20
-+++ sd/source/ui/app/app.src 4 Jun 2003 10:06:12 -0000
-@@ -395,9 +395,16 @@
- SID_HYPHENATION;\
- SID_THESAURUS;\
- SID_AUTOSPELL_CHECK;\
-+ SID_INSERT_FLD_DATE_FIX;\
-+ SID_INSERT_FLD_TIME_FIX;\
-+ SID_INSERT_FLD_AUTHOR;\
-+ SID_INSERT_FLD_PAGE;\
-+ SID_HELPINDEX;\
-+ SID_HELP_SUPPORTPAGE;\
-+ SID_ABOUT;\
- };\
- IdCount = {\
-- 285;\
-+ 292;\
- };
-
-
-Index: offmgr/source/offapp/app/app.src
-===================================================================
-RCS file: /cvs/framework/offmgr/source/offapp/app/app.src,v
-retrieving revision 1.89
-diff -u -p -u -r1.89 app.src
---- offmgr/source/offapp/app/app.src 2 Jul 2003 15:02:49 -0000 1.89
-+++ offmgr/source/offapp/app/app.src 9 Jul 2003 08:27:26 -0000
-@@ -930,9 +930,12 @@ ErrorBox RID_ERRBOX_MODULENOTINSTALLED
- SID_DIA; \
- SID_HIDE_SLIDE; \
- SID_CHOOSE_POLYGON; \
-+ SID_HELPINDEX; \
-+ SID_HELP_SUPPORTPAGE; \
-+ SID_ABOUT; \
- };\
- IdCount = {\
-- 101;\
-+ 104;\
- };
- #ifndef IMAGE_STDBTN_COLOR
- #define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
+++ /dev/null
-Index: sc/source/ui/view/viewfun5.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/viewfun5.cxx,v
-retrieving revision 1.18
-diff -u -r1.18 viewfun5.cxx
---- sc/source/ui/view/viewfun5.cxx 7 Nov 2001 12:49:49 -0000 1.18
-+++ sc/source/ui/view/viewfun5.cxx 12 Dec 2002 13:12:57 -0000
-@@ -120,6 +120,9 @@
- #include "tabvwsh.hxx" // wegen GetViewFrame
- #include "compiler.hxx"
-
-+#include "asciiopt.hxx"
-+#include "vcl/msgbox.hxx"
-+
- #ifndef _SFXVIEWFRM_HXX //autogen
- #include <sfx2/viewfrm.hxx>
- #endif
-@@ -131,6 +134,8 @@
-
- //------------------------------------------------------------------
-
-+#include <stdio.h>
-+
- BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
- const uno::Reference<datatransfer::XTransferable>& rxTransferable,
- USHORT nPosX, USHORT nPosY, Point* pLogicPos, BOOL bLink )
-@@ -268,12 +273,41 @@
- ScAddress aPos( nPosX, nPosY, GetViewData()->GetTabNo() );
- ScImportExport aObj( GetViewData()->GetDocument(), aPos );
-
-- ::rtl::OUString aStr;
-+ ::rtl::OUString aStr;
- SotStorageStreamRef xStream;
- if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.Is() )
- bRet = aObj.ImportStream( *xStream, nFormatId );
-- else if ( aDataHelper.GetString( nFormatId, aStr ) )
-- bRet = aObj.ImportString( aStr, nFormatId );
-+
-+ else if ( aDataHelper.GetString( nFormatId, aStr ) ) {
-+
-+ sal_Int32 newln;
-+ newln = aStr.indexOf ('\n');
-+/* ::rtl::OString tmpStr = OUStringToOString
-+ ( aStr, RTL_TEXTENCODING_UTF8 );
-+ fprintf (stderr, "String is '%s' (%d) [%d]\n",
-+ tmpStr.getStr (), tmpStr.getLength(), newln); */
-+ if (newln >= 0 && newln != aStr.getLength () - 1) { // do dialog
-+ // FIXME: split me out - if only C++ 'private' didn't suck rocks.
-+
-+ SvMemoryStream aStrm( (void*)aStr.getStr(), aStr.getLength() * sizeof(sal_Unicode), STREAM_READ );
-+ aStrm.SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
-+ // Hack - copied from impex.cxx - we need a helper to do this [!]
-+ aStrm.SetEndianSwap( FALSE );
-+
-+ ScImportAsciiDlg* pDlg = new ScImportAsciiDlg
-+ ( NULL, String::CreateFromAscii("Pasted Data"), &aStrm );
-+
-+ if (pDlg->Execute() == RET_OK) {
-+ ScAsciiOptions aOptions;
-+ pDlg->GetOptions( aOptions );
-+ aObj.SetExtOptions( aOptions );
-+
-+ bRet = aObj.ImportString( aStr, nFormatId );
-+ } else
-+ bRet = FALSE;
-+ } else
-+ bRet = aObj.ImportString( aStr, nFormatId );
-+ }
-
- InvalidateAttribs();
- GetViewData()->UpdateInputHandler();
+++ /dev/null
-Index: vcl/unx/source/gdi/dtint.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/dtint.cxx,v
-retrieving revision 1.16
-diff -u -p -u -r1.16 dtint.cxx
---- vcl/unx/source/gdi/dtint.cxx 28 May 2003 12:33:47 -0000 1.16
-+++ vcl/unx/source/gdi/dtint.cxx 4 Nov 2003 10:57:57 -0000
-@@ -573,7 +564,6 @@ void DtIntegrator::GetSystemLook( const
- aStyleSettings.SetAppFont( aFont );
- aStyleSettings.SetHelpFont( aFont );
- aStyleSettings.SetMenuFont( aFont );
-- aStyleSettings.SetToolFont( aFont );
- aStyleSettings.SetLabelFont( aFont );
- aStyleSettings.SetInfoFont( aFont );
- aStyleSettings.SetRadioCheckFont( aFont );
-@@ -581,6 +571,13 @@ void DtIntegrator::GetSystemLook( const
- aStyleSettings.SetFieldFont( aFont );
- aStyleSettings.SetIconFont( aFont );
- aStyleSettings.SetGroupFont( aFont );
-+
-+ // We want the tool font to be slightly smaller,
-+ // otherwise the ruler gets horribly bloated
-+ long nHeight = aFont.GetHeight();
-+ nHeight = ( nHeight + 8 ) / 2;
-+ aFont.SetHeight( nHeight );
-+ aStyleSettings.SetToolFont( aFont );
- }
- break;
- case ToolbarIconSize:
+++ /dev/null
-Index: vcl/unx/source/gdi/salbmp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salbmp.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 salbmp.cxx
---- vcl/unx/source/gdi/salbmp.cxx 11 Sep 2001 15:52:22 -0000 1.8
-+++ vcl/unx/source/gdi/salbmp.cxx 16 Sep 2003 12:51:50 -0000
-@@ -91,6 +91,9 @@
- #ifndef _SV_SALBMP_HXX
- #include <salbmp.hxx>
- #endif
-+#ifndef _SV_SALFRAME_HXX
-+#include <salframe.hxx>
-+#endif
-
- // -----------
- // - Defines -
-@@ -1140,4 +1146,16 @@ void ImplSalBitmapCache::ImplClear()
-
- maBmpList.Clear();
- mnTotalSize = 0;
-+}
-+
-+void
-+SalBitmap::SetWindowBg( SalFrame *pFrame )
-+{
-+ if( !pFrame )
-+ return;
-+
-+ XLIB_Window window = pFrame->maFrameData.GetWindow();
-+ DBG_ASSERT( mpDDB, "SetWindowBg needs valid DDB" );
-+ XSetWindowBackgroundPixmap (pFrame->maFrameData.GetXDisplay (),
-+ window, mpDDB->ImplGetPixmap ());
- }
-Index: vcl/source/window/introwin.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/introwin.cxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 introwin.cxx
---- vcl/source/window/introwin.cxx 27 Mar 2003 17:58:22 -0000 1.2
-+++ vcl/source/window/introwin.cxx 16 Sep 2003 12:51:51 -0000
-@@ -97,6 +97,18 @@
- #ifndef _SV_OPENGL_HXX
- #include <opengl.hxx>
- #endif
-+#ifndef _SV_BITMAP_HXX
-+#include <bitmap.hxx>
-+#endif
-+#ifndef _SV_BITMAPEX_HXX
-+#include <bitmapex.hxx>
-+#endif
-+#ifndef _SV_IMPBMP_HXX
-+#include <impbmp.hxx>
-+#endif
-+#ifndef _SV_SALBMP_HXX
-+#include <salbmp.hxx>
-+#endif
-
- #include <introwin.hxx>
-
-@@ -129,4 +141,21 @@ IntroWindow::~IntroWindow()
- pSVData->mpIntroWindow = NULL;
- }
-
-+void
-+IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap )
-+{
-+ SetBackground( Wallpaper( BitmapEx( rBitmap ) ) );
-+}
-
-+void
-+IntroWindow::Paint( const Rectangle &rRect )
-+{
-+ Bitmap aBmp( GetBackground().GetBitmap().GetBitmap() );
-+
-+ DrawBitmap( Point(), aBmp );
-+#ifdef UNX
-+ ImpBitmap *pImpBmp = aBmp.ImplGetImpBitmap();
-+ if( pImpBmp )
-+ pImpBmp->ImplGetSalBitmap ()->SetWindowBg( ImplGetFrame() );
-+#endif
-+}
-Index: vcl/inc/introwin.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/introwin.hxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 introwin.hxx
---- vcl/inc/introwin.hxx 27 Mar 2003 17:57:22 -0000 1.2
-+++ vcl/inc/introwin.hxx 16 Sep 2003 12:51:51 -0000
-@@ -82,6 +82,8 @@ private:
- public:
- IntroWindow();
- ~IntroWindow();
-+ void IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap );
-+ virtual void Paint( const Rectangle& );
- };
-
- #endif // _SV_INTROWIN_HXX
-Index: desktop/source/splash/splash.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/splash/splash.cxx,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 splash.cxx
---- desktop/source/splash/splash.cxx 15 Jul 2003 14:06:11 -0000 1.4
-+++ desktop/source/splash/splash.cxx 16 Sep 2003 12:51:51 -0000
-@@ -235,15 +235,16 @@ void SplashScreen::initBitmap()
- _aIntroBmp = Bitmap( aIntroBmpRes );
- delete pLabelResMgr;
- }
-+ SetBackgroundBitmap( _aIntroBmp );
- }
- }
-
--void SplashScreen::Paint( const Rectangle& )
-+void SplashScreen::Paint( const Rectangle& rRect )
- {
- if(!_bVisible) return;
- // draw bitmap
- if (_bPaintBitmap)
-- DrawBitmap( Point(), _aIntroBmp );
-+ IntroWindow::Paint( rRect );
-
- if (_bPaintProgress) {
- // draw progress...
-Index: vcl/unx/inc/salbmp.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/salbmp.hxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 salbmp.hxx
---- vcl/unx/inc/salbmp.hxx 29 Aug 2001 16:14:00 -0000 1.3
-+++ vcl/unx/inc/salbmp.hxx 16 Sep 2003 14:55:34 -0000
-@@ -77,6 +77,7 @@ class BitmapPalette;
- class SalGraphics;
- class ImplSalDDB;
- class ImplSalBitmapCache;
-+class SalFrame;
-
- // -------------
- // - SalBitmap -
-@@ -133,6 +134,7 @@ public:
- void ImplDraw( Drawable aDrawable, long nDrawableDepth,
- const SalTwoRect& rTwoRect, const GC& rGC ) const;
- #endif
-+ void SetWindowBg( SalFrame *pFrame );
-
- public:
-
+++ /dev/null
-Index: sfx2/source/appl/appreg.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/appreg.cxx,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 appreg.cxx
---- sfx2/source/appl/appreg.cxx 11 Oct 2002 15:14:20 -0000 1.7
-+++ sfx2/source/appl/appreg.cxx 9 Oct 2003 13:51:03 -0000
-@@ -110,7 +110,7 @@ void SfxApplication::Registrations_Impl(
- SfxMailChildWinWrapper_Impl::RegisterChildWindow();
- SfxMailChildWinWrapper_Impl::RegisterChildWindow();
- SfxPartChildWnd_Impl::RegisterChildWindow();
-- SfxTemplateDialogWrapper::RegisterChildWindow(TRUE);
-+ SfxTemplateDialogWrapper::RegisterChildWindow();
-
- // Controller
- SfxObjectVerbsControl::RegisterControl(SID_OBJECT);
+++ /dev/null
-Index: sw/source/ui/config/viewopt.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/config/viewopt.cxx,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 viewopt.cxx
---- sw/source/ui/config/viewopt.cxx 5 Jul 2001 13:48:54 -0000 1.4
-+++ sw/source/ui/config/viewopt.cxx 25 Feb 2003 16:15:51 -0000
-@@ -441,6 +441,7 @@ void SwViewOption::PaintPostIts( OutputD
- |*************************************************************************/
-
- SwViewOption::SwViewOption() :
-+ sSymbolFont( RTL_CONSTASCII_STRINGPARAM( "symbol" ) ),
- nZoom( 100 ),
- nPagePrevRow( 1 ),
- nPagePrevCol( 2 ),
+++ /dev/null
-Index: sw/source/ui/uiview/viewport.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/uiview/viewport.cxx,v
-retrieving revision 1.25.160.1
-diff -u -p -u -r1.25.160.1 viewport.cxx
---- sw/source/ui/uiview/viewport.cxx 22 Aug 2003 12:01:25 -0000 1.25.160.1
-+++ sw/source/ui/uiview/viewport.cxx 7 Oct 2003 09:33:04 -0000
-@@ -781,6 +781,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollba
- //Hier wieder auskommentieren wenn das mitscrollen nicht gewuenscht ist.
- // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE,
- // so we dont must do it agin.
-+ long nOldPge = nPgNum;
- EndScrollHdl(pScrollbar);
-
- Point aPos( aVisArea.TopLeft() );
-@@ -801,7 +802,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollba
- USHORT nPageCnt = pWrtShell->GetPageCnt();
- if( nPageCnt > 1 && Help::IsQuickHelpEnabled() )
- {
-- if( !nPgNum || nPgNum != nPhNum )
-+ if( !nOldPge || nOldPge != nPhNum )
- {
- Rectangle aRect;
- aRect.Left() = pScrollbar->GetParent()->OutputToScreenPixel(
+++ /dev/null
-Index: sfx2/source/dialog/cfg.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/dialog/cfg.src,v
-retrieving revision 1.32
-diff -u -p -u -r1.32 cfg.src
---- sfx2/source/dialog/cfg.src 17 Jul 2003 13:16:18 -0000 1.32
-+++ sfx2/source/dialog/cfg.src 6 Oct 2003 13:55:26 -0000
-@@ -441,14 +441,28 @@ TabPage TP_CONFIG_MENU
- Pos = MAP_APPFONT ( 244 , 77 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE ;
-- Symbol = IMAGEBUTTON_ARROW_UP ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10150.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- };
- ImageButton BTN_MN_DOWN
- {
- Pos = MAP_APPFONT ( 244 , 94 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE ;
-- Symbol = IMAGEBUTTON_ARROW_DOWN ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10151.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- };
- PushButton BTN_RESET
- {
-Index: svx/source/dialog/hyphen.src
-===================================================================
-RCS file: /cvs/graphics/svx/source/dialog/hyphen.src,v
-retrieving revision 1.18
-diff -u -p -u -r1.18 hyphen.src
---- svx/source/dialog/hyphen.src 17 Jul 2003 11:18:32 -0000 1.18
-+++ svx/source/dialog/hyphen.src 6 Oct 2003 13:55:41 -0000
-@@ -98,14 +98,28 @@ ModalDialog RID_SVXDLG_HYPHENATE
- Pos = MAP_APPFONT ( 6 , 33 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TABSTOP = TRUE ;
-- SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10152.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- };
- ImageButton BTN_RIGHT
- {
- Pos = MAP_APPFONT ( 22 , 33 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TABSTOP = TRUE ;
-- Symbol = IMAGEBUTTON_ARROW_RIGHT ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10153.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- };
- FixedText FT_WORD
- {
-Index: sw/source/ui/envelp/envlop.src
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/envelp/envlop.src,v
-retrieving revision 1.32
-diff -u -r1.32 envlop.src
---- sw/source/ui/envelp/envlop.src 17 Jul 2003 11:53:20 -0000 1.32
-+++ sw/source/ui/envelp/envlop.src 28 Oct 2003 12:10:53 -0000
-@@ -413,8 +413,16 @@
- ImageButton BTN_INSERT
- {
- Pos = MAP_APPFONT ( 137 , 71 ) ;
-- Size = MAP_APPFONT ( 18 , 12 ) ;
-- SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
-+ Size = MAP_APPFONT ( 18 , 14 ) ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10152.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
-+
- TabStop = TRUE ;
- };
- FixedText FT_DBFIELD
-Index: sw/source/ui/frmdlg/olumn.src
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/frmdlg/column.src,v
-retrieving revision 1.48
-diff -u -r1.48 column.src
---- sw/source/ui/frmdlg/column.src 17 Jul 2003 11:57:05 -0000 1.48
-+++ sw/source/ui/frmdlg/column.src 28 Oct 2003 12:09:57 -0000
-@@ -247,9 +247,17 @@
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 62 , 69 ) ;
-- Size = MAP_APPFONT ( 10 , 10 ) ;
-+ Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE ;
-- SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10152.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
-+
- };
- FixedText FT_1
- {
-@@ -276,9 +284,17 @@
- {
- Disable = TRUE ;
- Pos = MAP_APPFONT ( 238 , 69 ) ;
-- Size = MAP_APPFONT ( 10 , 10 ) ;
-+ Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE ;
-- SYMBOL = IMAGEBUTTON_ARROW_RIGHT ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10153.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
-+
- };
- FixedText FT_WIDTH
- {
-Index: sw/source/ui/index/cnttab.src
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/index/cnttab.src,v
-retrieving revision 1.69
-diff -u -r1.69 cnttab.src
---- sw/source/ui/index/cnttab.src 22 Jul 2003 16:51:59 -0000 1.69
-+++ sw/source/ui/index/cnttab.src 28 Oct 2003 12:12:30 -0000
-@@ -2902,8 +2902,16 @@
- ImageButton WIN_LEFT_SCROLL
- {
- Pos = MAP_APPFONT ( 0, 0 ) ;
-- Size = MAP_APPFONT ( 10, 12 ) ;
-- Symbol = IMAGEBUTTON_ARROW_LEFT;
-+ Size = MAP_APPFONT ( 14, 14 );
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10152.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
-+
- DialogControl = FALSE;
- TabStop = FALSE;
- };
-@@ -2916,8 +2924,16 @@
- ImageButton WIN_RIGHT_SCROLL
- {
- Pos = MAP_APPFONT ( 126, 0 ) ;
-- Size = MAP_APPFONT ( 10, 12 ) ;
-- Symbol = IMAGEBUTTON_ARROW_RIGHT;
-+ Size = MAP_APPFONT ( 14, 14 ) ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10153.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
-+
- DialogControl = FALSE;
- TabStop = FALSE;
- };
-Index: svx/source/dialog/textanim.src
-===================================================================
-RCS file: /cvs/graphics/svx/source/dialog/textanim.src,v
-retrieving revision 1.30
-diff -u -r1.30 textanim.src
---- svx/source/dialog/textanim.src 17 Jul 2003 11:24:13 -0000 1.30
-+++ svx/source/dialog/textanim.src 30 Oct 2003 13:36:59 -0000
-@@ -469,7 +469,15 @@
- Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
- RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP );
- Size = BUTTON_SIZE ;
-- Symbol = IMAGEBUTTON_ARROW_UP ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10150.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
-+
- QuickHelpText = "Nach Oben" ;
- QuickHelpText [ ENGLISH ] = "To top" ;
- QuickHelpText [ english_us ] = "To Top" ;
-@@ -505,7 +513,14 @@
- Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 3*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
- RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT);
- Size = BUTTON_SIZE ;
-- Symbol = IMAGEBUTTON_ARROW_LEFT ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10152.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- QuickHelpText = "Nach Links" ;
- QuickHelpText [ ENGLISH ] = "To left" ;
- QuickHelpText [ english_us ] = "To Left" ;
-@@ -541,7 +556,14 @@
- Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
- RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT ) ;
- Size = BUTTON_SIZE ;
-- Symbol = IMAGEBUTTON_ARROW_RIGHT ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10153.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- QuickHelpText = "Nach Rechts" ;
- QuickHelpText [ ENGLISH ] = "To left" ;
- QuickHelpText [ english_us ] = "To Right" ;
-@@ -577,7 +599,14 @@
- Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
- RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 2*MA_BUTTON_HEIGHT ) ;
- Size = BUTTON_SIZE ;
-- Symbol = IMAGEBUTTON_ARROW_DOWN ;
-+ ButtonImage = Image
-+ {
-+ ImageBitmap = Bitmap
-+ {
-+ File = "lc10151.bmp" ;
-+ };
-+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-+ };
- QuickHelpText = "Nach Unten" ;
- QuickHelpText [ ENGLISH ] = "To bottom" ;
- QuickHelpText [ english_us ] = "To Bottom" ;
+++ /dev/null
-Index: svx/source/tbxctrls/tbcontrl.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/tbxctrls/tbcontrl.cxx,v
-retrieving revision 1.42
-diff -u -p -u -r1.42 tbcontrl.cxx
---- svx/source/tbxctrls/tbcontrl.cxx 6 Jun 2003 10:44:32 -0000 1.42
-+++ svx/source/tbxctrls/tbcontrl.cxx 1 Oct 2003 23:06:27 -0000
-@@ -78,6 +78,9 @@
- #ifndef _SV_SYSTEM_HXX //autogen wg. System
- #include <vcl/system.hxx>
- #endif
-+#ifndef _SV_BMPACC_HXX
-+#include <vcl/bmpacc.hxx>
-+#endif
- #ifndef _VALUESET_HXX
- #include <svtools/valueset.hxx>
- #endif
-@@ -426,10 +429,9 @@ private:
- USHORT nDrawMode;
- USHORT nBtnId;
- ToolBox* pTbx;
-- Bitmap* pBtnBmp;
-+ BitmapEx aOrigBitmap;
- Color aCurColor;
- Rectangle theUpdRect;
-- Size theBmpSize;
- BOOL bWasHiContrastMode;
- };
-
-@@ -1788,7 +1794,6 @@ SvxTbxButtonColorUpdater_Impl::SvxTbxBut
- nDrawMode ( nMode ),
- nBtnId ( nTbxBtnId ),
- pTbx ( ptrTbx ),
-- pBtnBmp ( NULL ),
- aCurColor ( COL_TRANSPARENT )
- {
- if (nTbxBtnId == SID_BACKGROUND_COLOR)
-@@ -1803,106 +1808,82 @@ SvxTbxButtonColorUpdater_Impl::SvxTbxBut
-
- SvxTbxButtonColorUpdater_Impl::~SvxTbxButtonColorUpdater_Impl()
- {
-- delete pBtnBmp;
- }
-
- // -----------------------------------------------------------------------
-
--void SvxTbxButtonColorUpdater_Impl::Update( const Color& rColor )
-+// This sucks - but so does VirtualDevice for rendering on AlphaMasks
-+static void
-+BitmapDrawRect( Bitmap &rBitmap, const Rectangle &rRect, const Color& rColor )
- {
-- Image aImage( pTbx->GetItemImage( nBtnId ) );
-- BOOL bSizeChanged = ( theBmpSize != aImage.GetSizePixel() );
-- BOOL bDisplayModeChanged = ( bWasHiContrastMode != pTbx->GetBackground().GetColor().IsDark() );
--
-- Color aColor( rColor );
--
-- // #109290# Workaround for SetFillColor with COL_AUTO
-- if ( aColor.GetColor() == COL_AUTO )
-- aColor = Color( IMAGE_COL_TRANSPARENT );
-+ BitmapWriteAccess *pUpd = rBitmap.AcquireWriteAccess();
-
-- if ( aCurColor == aColor && !bSizeChanged && !bDisplayModeChanged )
-- return;
-+ for( long nY = rRect.Top(); nY < rRect.Bottom(); nY++ )
-+ for( long nX = rRect.Left(); nX < rRect.Right(); nX ++ )
-+ pUpd->SetPixel( nY, nX, rColor );
-
-- VirtualDevice aVirDev( *pTbx );
-- Point aNullPnt;
-+ rBitmap.ReleaseAccess( pUpd );
-+}
-
-- if ( bSizeChanged || bDisplayModeChanged )
-- {
-- bWasHiContrastMode = pTbx->GetBackground().GetColor().IsDark();
-- theBmpSize = aImage.GetSizePixel();
-+void SvxTbxButtonColorUpdater_Impl::Update( const Color& rColor )
-+{
-+ Image aImage( pTbx->GetItemImage( nBtnId ) );
-
-- if ( theBmpSize.Width() <= 16 )
-- theUpdRect = Rectangle( Point(7,7), Size(8,8) );
-- else
-- theUpdRect = Rectangle( Point(14,14), Size(11,11) );
-+ BOOL bIconChanged = ( aOrigBitmap.IsEmpty() && !aImage.GetBitmap().IsEmpty() ) ||
-+ ( aOrigBitmap.GetSizePixel() != aImage.GetSizePixel() ) ||
-+ ( bWasHiContrastMode != pTbx->GetBackground().GetColor().IsDark() );
-+
-+ if ( aCurColor == rColor && !bIconChanged )
-+ return;
-+ aCurColor = rColor;
-
-- aVirDev.SetPen( Pen( PEN_NULL ) );
-- aVirDev.SetOutputSizePixel( theBmpSize );
-- aVirDev.SetFillColor( Color( IMAGE_COL_TRANSPARENT ) );
-- aVirDev.DrawRect( Rectangle( aNullPnt, theBmpSize ) );
-- aVirDev.DrawImage( aNullPnt, aImage );
-- delete pBtnBmp;
-- pBtnBmp = new Bitmap( aVirDev.GetBitmap( aNullPnt, theBmpSize ) );
-- if ( nDrawMode != TBX_UPDATER_MODE_CHAR_COLOR_NEW )
-- aVirDev.DrawRect( theUpdRect );
-- }
-- else if ( !pBtnBmp )
-- pBtnBmp = new Bitmap( aVirDev.GetBitmap( aNullPnt, theBmpSize ) );
--
-- aVirDev.SetOutputSizePixel( theBmpSize );
-- aVirDev.DrawBitmap( aNullPnt, *pBtnBmp );
--
-- // Choose line color according to background color
-- if ( pTbx->GetBackground().GetColor().IsDark() )
-- aVirDev.SetLineColor( COL_WHITE );
-+ Rectangle aUpdRect;
-+ if ( aImage.GetSizePixel().Width() <= 16 )
-+ aUpdRect = Rectangle( Point( 0,12 ), Size( aImage.GetSizePixel().Width(), 4 ) );
- else
-- aVirDev.SetLineColor( COL_BLACK );
-+ aUpdRect = Rectangle( Point( 1,19 ), Size( 24,6 ) );
-
-- if ( nDrawMode == TBX_UPDATER_MODE_CHAR_COLOR_NEW &&
-- ( aColor.GetColor() != COL_AUTO &&
-- aColor.GetColor() != IMAGE_COL_TRANSPARENT ))
-+ if ( bIconChanged )
- {
-- // Draw border only if COLOR_AUTO is the new color!
-- aVirDev.SetLineColor( aColor );
-+ aOrigBitmap = BitmapEx( aImage.GetBitmap(), aImage.GetMaskBitmap() );
-+ bWasHiContrastMode = pTbx->GetBackground().GetColor().IsDark();
- }
-- aVirDev.SetFillColor( aColor );
-
-- if ( nDrawMode == TBX_UPDATER_MODE_CHAR_COLOR_NEW )
-+ Bitmap aNewBitmap( aOrigBitmap.GetBitmap() );
-+ Bitmap aNewMask( aOrigBitmap.GetMask() );
-+
-+ BitmapDrawRect( aNewMask, aUpdRect, COL_BLACK );
-+ if( rColor.GetColor() == COL_AUTO )
- {
-- // New mode for our new high contrast enabled bitmaps
-- if ( theBmpSize.Width() <= 16 )
-- theUpdRect = Rectangle( Point( 0,12 ), Size(theBmpSize.Width(), 4 ) );
-+ Rectangle aInnerRect( aUpdRect.Left() + 1,
-+ aUpdRect.Top() + 1,
-+ aUpdRect.Right() - 1,
-+ aUpdRect.Bottom() - 1 );
-+ BitmapDrawRect( aNewMask, aInnerRect, COL_WHITE );
-+
-+ Color aLineColor;
-+ if ( pTbx->GetBackground().GetColor().IsDark() )
-+ aLineColor = COL_WHITE;
- else
-- theUpdRect = Rectangle( Point( 1,19 ), Size( 24,6 ) );
-- aVirDev.DrawRect( theUpdRect );
-- }
-- else if ( nDrawMode != TBX_UPDATER_MODE_NONE )
-- {
-- DrawChar( aVirDev, aColor );
-- }
-- else
-- aVirDev.DrawRect( theUpdRect );
-+ aLineColor = COL_BLACK;
-
-- aCurColor = aColor;
--
-- // The following code asumes that we cannot change the display color depth
-- // during Office runtime. Which is at least NOT true for newer Windows versions!
-- const Bitmap aBmp( aVirDev.GetBitmap( aNullPnt, theBmpSize ) );
-- static Color aTransparentColor;
-- static sal_Bool bTransparentColorInitialized = sal_False;
--
-- if( !bTransparentColorInitialized )
-- {
-- aVirDev.DrawPixel( aNullPnt, IMAGE_COL_TRANSPARENT );
-- aTransparentColor = aVirDev.GetPixel( aNullPnt );
-- bTransparentColorInitialized = sal_True;
-+ Rectangle aHoriz( aUpdRect.Left(), aUpdRect.Top(),
-+ aUpdRect.Right(), aUpdRect.Top() + 1 );
-+ Rectangle aVert ( aUpdRect.Left(), aUpdRect.Top(),
-+ aUpdRect.Left() + 1, aUpdRect.Bottom() );
-+ BitmapDrawRect( aNewBitmap, aHoriz, aLineColor );
-+ aHoriz.Move( 0, aUpdRect.Bottom() - aUpdRect.Top() - 1 );
-+ BitmapDrawRect( aNewBitmap, aHoriz, aLineColor );
-+ BitmapDrawRect( aNewBitmap, aVert, aLineColor );
-+ aVert.Move( aUpdRect.Right() - aUpdRect.Left() - 1, 0 );
-+ BitmapDrawRect( aNewBitmap, aVert, aLineColor );
- }
-+ else
-+ BitmapDrawRect( aNewBitmap, aUpdRect, rColor );
-
-- Bitmap aMaskBitmap = aBmp.CreateMask( aTransparentColor );
-- Image aNewImage( aBmp, aMaskBitmap );
-- pTbx->SetItemImage( nBtnId, aNewImage );
-+ pTbx->SetItemImage( nBtnId, Image( aNewBitmap, aNewMask ) );
- }
--
-+#if 0
- // -----------------------------------------------------------------------
-
- void SvxTbxButtonColorUpdater_Impl::DrawChar( VirtualDevice& rVirDev, const Color& rCol )
-@@ -1935,6 +1916,7 @@ void SvxTbxButtonColorUpdater_Impl::Draw
- rVirDev.DrawText( aPos, 'A' );
- rVirDev.SetFont( aOldFont );
- }
-+#endif
- //========================================================================
- // class SfxStyleControllerItem_Impl ------------------------------------------
- //========================================================================
+++ /dev/null
---- svx/source/tbxctrls/tbcontrl.cxx
-+++ svx/source/tbxctrls/tbcontrl.cxx
-@@ -1008,6 +1008,10 @@
- #define WB_NO_DIRECTSELECT ((WinBits)0x04000000)
- #endif
-
-+#define PALETTE_X 10
-+#define PALETTE_Y 10
-+#define PALETTE_SIZE (PALETTE_X * PALETTE_Y)
-+
- SvxColorWindow_Impl::SvxColorWindow_Impl( USHORT nId, USHORT nSlotId,
- const String& rWndTitle,
- SfxBindings& rBindings ) :
-@@ -1021,7 +1025,7 @@
- SfxObjectShell* pDocSh = SfxObjectShell::Current();
- const SfxPoolItem* pItem = NULL;
- XColorTable* pColorTable = NULL;
-- const Size aSize12( 12, 12 );
-+ const Size aSize12( 13, 13 );
-
- if ( pDocSh )
- if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) )
-@@ -1051,8 +1055,8 @@
- Color aColWhite( COL_WHITE );
- String aStrWhite( SVX_RES(RID_SVXITEMS_COLOR_WHITE) );
-
-- if ( nCount > 80 )
-- // bei mehr als 80 Farben ScrollBar anzeigen
-+ if ( nCount > PALETTE_SIZE )
-+ // bei mehr als Max Farben ScrollBar anzeigen
- aColorSet.SetStyle( aColorSet.GetStyle() | WB_VSCROLL );
-
- for ( i = 0; i < nCount; i++ )
-@@ -1061,17 +1065,17 @@
- aColorSet.InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() );
- }
-
-- while ( i < 80 )
-+ while ( i < PALETTE_SIZE )
- {
-- // bei weniger als 80 Farben, mit Weiss auff"ullen
-+ // bei weniger als Max Farben, mit Weiss auff"ullen
- aColorSet.InsertItem( i+1, aColWhite, aStrWhite );
- i++;
- }
- }
-
- aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
-- aColorSet.SetColCount( 8 );
-- aColorSet.SetLineCount( 10 );
-+ aColorSet.SetColCount( PALETTE_X );
-+ aColorSet.SetLineCount( PALETTE_Y );
-
- lcl_CalcSizeValueSet( *this, aColorSet, aSize12 );
-
-@@ -1163,7 +1167,7 @@
-
- // ScrollBar an oder aus
- WinBits nBits = aColorSet.GetStyle();
-- if ( nCount > 80 )
-+ if ( nCount > PALETTE_SIZE )
- nBits &= ~WB_VSCROLL;
- else
- nBits |= WB_VSCROLL;
-@@ -1176,7 +1180,7 @@
- aColorSet.SetItemText ( i + 1, pEntry->GetName() );
- }
-
-- while ( i < 80 )
-+ while ( i < PALETTE_SIZE )
- {
- aColorSet.SetItemColor( i + 1, aColWhite );
- aColorSet.SetItemText ( i + 1, aStrWhite );
+++ /dev/null
-Index: sfx2/source/toolbox/tbxcust.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/toolbox/tbxcust.cxx,v
-retrieving revision 1.27
-diff -u -p -u -r1.27 tbxcust.cxx
---- sfx2/source/toolbox/tbxcust.cxx 15 May 2003 10:54:28 -0000 1.27
-+++ sfx2/source/toolbox/tbxcust.cxx 1 Oct 2003 16:18:43 -0000
-@@ -1026,14 +1026,12 @@ SfxUserBitmapDialog_Impl::SfxUserBitmapD
- pMgr (pTbxMgr),
- pImageMgr (pImgMgr),
- bNoDefaultImage (FALSE),
-- bBigImages (FALSE),
-- nBmpColorConversion(BMP_CONVERSION_4BIT_COLORS),
-- nBmpColorDepth(4)
-+ bBigImages (FALSE)
- {
- // file name prefixes for standard images
-- const sal_Int32 nPrefixLength = 2;
-- const char aSmallImagePrefix[] = "s_";
-- const char aBigImagePrefix[] = "l_";
-+ const sal_Int32 nPrefixLength = 1;
-+ const char aSmallImagePrefix[] = "s";
-+ const char aBigImagePrefix[] = "l";
-
- Color aColor( pImageMgr->GetMaskColor() );
- FreeResource();
-@@ -1046,52 +1044,10 @@ SfxUserBitmapDialog_Impl::SfxUserBitmapD
- String aEmptyStr;
- Size aSize = pImageMgr->GetImageSize();
-
-- // #109421#
-- // Get reference bitmap to determine the current color depth. Due to restriction
-- // of the ImageList and toolbar implementation we can only use one color depth
-- // for all bitmaps in an ImageList. Reference color depth is defined by the bitmaps
-- // in our resources.
-- Image aRefImage = pImageMgr->GetImage( SID_OPENDOC, BOOL(FALSE), 0 );
-- if ( !!aRefImage )
-- {
-- Bitmap aRefBitmap = aRefImage.GetBitmap();
-- USHORT nColorDepth = aRefBitmap.GetBitCount();
-- if ( nColorDepth == 1 )
-- {
-- nBmpColorConversion = BMP_CONVERSION_1BIT_THRESHOLD;
-- nBmpColorDepth = 1;
-- }
-- else if ( nColorDepth <= 4 )
-- {
-- nBmpColorConversion = BMP_CONVERSION_4BIT_COLORS;
-- nBmpColorDepth = 4;
-- }
-- else if ( nColorDepth <= 8 )
-- {
-- nBmpColorConversion = BMP_CONVERSION_8BIT_COLORS;
-- nBmpColorDepth = 8;
-- }
-- else
-- {
-- nBmpColorConversion = BMP_CONVERSION_24BIT;
-- nBmpColorDepth = 24;
-- }
-- }
--
- // Search the given directory for bitmaps:
- Sequence< rtl::OUString > aUrls(
- SfxContentHelper::GetFolderContents( aDirName, false ));
- USHORT nId = 1;
-- ImageList aImages(128, 128); // large growth factor, expecting many entries
--
-- Image aDefaultImage = GetDefaultImage( nFuncId );
--
-- // Initially add default image to the front
-- aBitmapUrls.push_back( aEmptyStr );
-- aSymbolTb.InsertItem( nId, aEmptyStr );
-- aImages.AddImage( nId, aDefaultImage );
--
-- ++nId;
-
- // Insert the default image on the first position
- for (sal_Int32 i = 0; i < aUrls.getLength(); ++i)
-@@ -1103,27 +1059,21 @@ SfxUserBitmapDialog_Impl::SfxUserBitmapD
- {
- rtl::OUString aFileName = aUrlObj.getName();
-
-- // Ignore "s_*" files if we show big images and "l_*" files if we show small images!
-- sal_Bool bIgnoreFile = bBigImages ? aFileName.matchIgnoreAsciiCaseAsciiL( aSmallImagePrefix, nPrefixLength, 0 ) :
-- aFileName.matchIgnoreAsciiCaseAsciiL( aBigImagePrefix, nPrefixLength, 0 );
-+ // Ignore "s*" files if we show big images and "l*" files if we show small images!
-+ sal_Bool bIgnoreFile = bBigImages ? !aFileName.matchIgnoreAsciiCaseAsciiL( aBigImagePrefix, nPrefixLength, 0 ) :
-+ !aFileName.matchIgnoreAsciiCaseAsciiL( aSmallImagePrefix, nPrefixLength, 0 );
- if ( !bIgnoreFile )
- {
- Bitmap aBitmap( createBitmap( rUrl ));
--
-- // Check if we have a valid bitmap otherwise it can be possible that we can crash!!
-- if ( !!aBitmap )
-- {
-- if ( aBitmap.GetSizePixel() != aSize )
-- aBitmap.Scale( aSize, BMP_SCALE_FAST );
--
-- // Add image to the image list which will be used to initialize toolbox
-- aBitmapUrls.push_back( rUrl );
-- aImages.AddImage( nId, Image( aBitmap, aColor ) );
-- aSymbolTb.InsertItem( nId, aUrlObj.getName() );
--
-- if (++nId == 0)
-- break;
-- }
-+
-+ if ( aBitmap.GetSizePixel() != aSize )
-+ continue;
-+
-+ // Add image to the image list which will be used to initialize toolbox
-+ aBitmapUrls.push_back( rUrl );
-+ aSymbolTb.InsertItem( nId, aUrlObj.getName() );
-+ aSymbolTb.SetItemImage( nId, Image( BitmapEx( aBitmap, aColor ) ) );
-+ nId++;
- }
- }
- }
-@@ -1135,24 +1085,13 @@ SfxUserBitmapDialog_Impl::SfxUserBitmapD
- for ( sal_Int32 i = 0; i < pOfficeImageList->GetImageCount(); i++ )
- {
- USHORT nImageId = pOfficeImageList->GetImageId(i);
-- aSymbolTb.InsertItem( nImageId, aEmptyStr );
--
-- aImages.AddImage( nImageId, pOfficeImageList->GetImage( nImageId ));
--
-- if (++nId == 0)
-- break;
-+ aSymbolTb.InsertItem( nImageId, aEmptyStr );
-+ aSymbolTb.SetItemImage( nImageId, pOfficeImageList->GetImage( nImageId ) );
- }
- }
-
-- // Set imagelist to the toolbox
-- aSymbolTb.SetImageList( aImages );
--
- LeaveWait();
--/*
-- // Einen Button f"ur reine Textbuttons einf"ugen
-- aSymbolTb.InsertItem(nCount+1, "Text");
-- aSymbolTb.SetItemImage(nCount+1, Image());
--*/
-+
- aOKButton.SetClickHdl( LINK(this,SfxUserBitmapDialog_Impl, OKHdl));
- aSymbolTb.SetSelectHdl(LINK(this,SfxUserBitmapDialog_Impl, SelectHdl));
- aDefaultBtn.SetClickHdl(LINK(this,SfxUserBitmapDialog_Impl, DefaultHdl));
-@@ -1325,12 +1265,7 @@ Bitmap SfxUserBitmapDialog_Impl::createB
- (*pStream) >> aBitmap;
- delete pStream;
- }
--
-- // Convert bitmap color depth to match our resource bitmap color depth. Otherwise
-- // we will have display problems on the screen. #109421#
-- if ( aBitmap.GetBitCount() != nBmpColorDepth )
-- aBitmap.Convert( nBmpColorConversion );
--
-+
- return aBitmap;
- }
-
+++ /dev/null
-Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
-===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 Common.xcs
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 24 Jul 2003 13:12:08 -0000 1.84
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 3 Sep 2003 10:21:40 -0000
-@@ -24746,36 +24746,41 @@
- </enumeration>
- <enumeration oor:value="1">
- <info>
-- <desc xml:lang="en-US">32x32 pixel icons</desc>
-- <desc xml:lang="el">32x32 pixel icons</desc>
-- <desc xml:lang="nl">32x32 pixel icons</desc>
-- <desc xml:lang="fr">32x32 pixel icons</desc>
-- <desc xml:lang="fi">32x32 pixel icons</desc>
-- <desc xml:lang="cs">32x32 pixel icons</desc>
-- <desc xml:lang="da">32x32 pixel icons</desc>
-- <desc xml:lang="zh-CN">32x32 ćçŽ ćŸæ </desc>
-- <desc xml:lang="zh-TW">32x32 pixel icons</desc>
-- <desc xml:lang="ar">32x32 pixel icons</desc>
-- <desc xml:lang="he">32x32 pixel icons</desc>
-- <desc xml:lang="ca">32x32 pixel icons</desc>
-- <desc xml:lang="hi-IN">32x32 pixel icons</desc>
-- <desc xml:lang="pt">32x32 pixel icons</desc>
-- <desc xml:lang="ru">32x32 pixel icons</desc>
-- <desc xml:lang="es">32x32 pixel icons</desc>
-- <desc xml:lang="it">32x32 pixel icons</desc>
-- <desc xml:lang="sk">32x32 pixel icons</desc>
-- <desc xml:lang="sv">32x32 pixel icons</desc>
-- <desc xml:lang="pl">32x32 pixel icons</desc>
-- <desc xml:lang="pt-BR">32x32 pixel icons</desc>
-+ <desc xml:lang="en-US">24x24 pixel icons</desc>
-+ <desc xml:lang="el">24x24 pixel icons</desc>
-+ <desc xml:lang="nl">24x24 pixel icons</desc>
-+ <desc xml:lang="fr">24x24 pixel icons</desc>
-+ <desc xml:lang="fi">24x24 pixel icons</desc>
-+ <desc xml:lang="cs">24x24 pixel icons</desc>
-+ <desc xml:lang="da">24x24 pixel icons</desc>
-+ <desc xml:lang="zh-CN">24x24 ćçŽ ćŸæ </desc>
-+ <desc xml:lang="zh-TW">24x24 pixel icons</desc>
-+ <desc xml:lang="ar">24x24 pixel icons</desc>
-+ <desc xml:lang="he">24x24 pixel icons</desc>
-+ <desc xml:lang="ca">24x24 pixel icons</desc>
-+ <desc xml:lang="hi-IN">24x24 pixel icons</desc>
-+ <desc xml:lang="pt">24x24 pixel icons</desc>
-+ <desc xml:lang="ru">24x24 pixel icons</desc>
-+ <desc xml:lang="es">24x24 pixel icons</desc>
-+ <desc xml:lang="it">24x24 pixel icons</desc>
-+ <desc xml:lang="sk">24x24 pixel icons</desc>
-+ <desc xml:lang="sv">24x24 pixel icons</desc>
-+ <desc xml:lang="pl">24x24 pixel icons</desc>
-+ <desc xml:lang="pt-BR">24x24 pixel icons</desc>
- <desc xml:lang="ja">32Ă32 ăăŻă»ă«ăąă€ăłăł</desc>
-- <desc xml:lang="ko">32x32 pixel icons</desc>
-- <desc xml:lang="tr">32x32 pixel icons</desc>
-- <desc xml:lang="th">32x32 pixel icons</desc>
-- <desc xml:lang="x-comment">32x32 pixel icons</desc>
-- <desc xml:lang="hu">32x32 pixel icons</desc>
-- <desc xml:lang="sl">32x32 pixel icons</desc>
-+ <desc xml:lang="ko">24x24 pixel icons</desc>
-+ <desc xml:lang="tr">24x24 pixel icons</desc>
-+ <desc xml:lang="th">24x24 pixel icons</desc>
-+ <desc xml:lang="x-comment">24x24 pixel icons</desc>
-+ <desc xml:lang="hu">24x24 pixel icons</desc>
-+ <desc xml:lang="sl">24x24 pixel icons</desc>
- </info>
- </enumeration>
-+ <enumeration oor:value="2">
-+ <info>
-+ <desc xml:lang="en-US">automatic icon sizing</desc>
-+ </info>
-+ </enumeration>
- </constraints>
-- <value>0</value>
-+ <value>1</value>
- </prop>
- <prop oor:name="ToolboxStyle" oor:type="xs:short">
- <!-- UIHints: Tools Options General View -->
+++ /dev/null
-Index: vcl/source/window/toolbox.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/toolbox.cxx,v
-retrieving revision 1.61
-diff -u -p -u -r1.61 toolbox.cxx
---- vcl/source/window/toolbox.cxx 28 May 2003 12:32:32 -0000 1.61
-+++ vcl/source/window/toolbox.cxx 15 Sep 2003 10:03:43 -0000
-@@ -3045,6 +3044,7 @@ void ToolBox::ImplDrawItem( USHORT nPos,
- {
- DrawSelectionBackground( pItem->maRect, bHighlight, pItem->meState == STATE_CHECK, TRUE, pItem->mpWindow ? TRUE : FALSE );
-
-+#ifdef DRAW_1BIT_ALPHA_SHADOWS
- // draw shadows
- if( bHighlight == 2 && pItem->meState != STATE_CHECK )
- {
-@@ -3063,17 +3063,15 @@ void ToolBox::ImplDrawItem( USHORT nPos,
- nTempOffX-=2;
- nTempOffY-=2;
- }
-+#endif
-
- if( bHighlight )
- {
- if( bHighContrastWhite )
- nImageStyle |= IMAGE_DRAW_COLORTRANSFORM;
- }
-- DrawImage( Point( nTempOffX, nTempOffY ), *pImage, nImageStyle );
--
- }
-- else
-- DrawImage( Point( nTempOffX, nTempOffY ), *pImage, nImageStyle );
-+ DrawImage( Point( nTempOffX, nTempOffY ), *pImage, nImageStyle );
- }
-
- // Text ausgeben
-Index: vcl/source/window/window.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
-retrieving revision 1.176
-diff -u -p -u -r1.176 window.cxx
---- vcl/source/window/window.cxx 1 Jul 2003 14:48:37 -0000 1.176
-+++ vcl/source/window/window.cxx 15 Sep 2003 10:04:20 -0000
-@@ -8583,8 +8588,13 @@ void Window::DrawSelectionBackground( co
- Color aSelectionFillCol( aSelectionBorderCol );
- Color aSelectionMaskCol( aSelectionBorderCol );
-
-+#ifdef HORRIBLE_WITH_INDUSTRIAL_THEME
- BOOL bDark = GetSettings().GetStyleSettings().GetFaceColor().IsDark();
- BOOL bBright = GetSettings().GetStyleSettings().GetFaceColor().IsBright();
-+#else
-+ BOOL bDark = FALSE;
-+ BOOL bBright = FALSE;
-+#endif
-
- int c1 = aSelectionBorderCol.GetLuminance();
- int c2 = GetDisplayBackground().GetColor().GetLuminance();
+++ /dev/null
-Index: vcl/source/window/toolbox.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/toolbox.cxx,v
-retrieving revision 1.60
-diff -u -p -u -r1.60 toolbox.cxx
---- vcl/source/window/toolbox.cxx 17 Apr 2003 15:19:46 -0000 1.60
-+++ vcl/source/window/toolbox.cxx 14 May 2003 08:11:12 -0000
-@@ -3024,9 +3024,6 @@ void ToolBox::ImplDrawItem( USHORT nPos,
- if ( !pItem->mbEnabled || !IsEnabled() )
- nImageStyle |= IMAGE_DRAW_DISABLE;
-
-- if ( pItem->meState == STATE_DONTKNOW )
-- nImageStyle |= IMAGE_DRAW_DISABLE;
--
-
- // Image ausgeben
- nTempOffX = nOffX;
+++ /dev/null
-Index: vcl/source/window/toolbox.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/window/toolbox.cxx,v
-retrieving revision 1.60
-diff -u -p -u -r1.60 toolbox.cxx
---- vcl/source/window/toolbox.cxx 17 Apr 2003 15:19:46 -0000 1.60
-+++ vcl/source/window/toolbox.cxx 13 May 2003 12:16:02 -0000
-@@ -2795,27 +2795,29 @@ void ToolBox::ImplDrawItem( USHORT nPos,
- pTempItem = &mpData->m_aItems[nPos+1];
- if ( !pTempItem->mbShowWindow && !pTempItem->mbBreak )
- {
-- long nCenterPos;
-+ long nCenterPos, nSlim;
- SetLineColor( rStyleSettings.GetShadowColor() );
- if ( IsHorizontal() )
- {
-+ nSlim = (pItem->maRect.Bottom() - pItem->maRect.Top ()) / 4;
- nCenterPos = pItem->maRect.Center().X()-1;
-- DrawLine( Point( nCenterPos, pItem->maRect.Top() ),
-- Point( nCenterPos, pItem->maRect.Bottom() ) );
-+ DrawLine( Point( nCenterPos, pItem->maRect.Top() + nSlim - 1),
-+ Point( nCenterPos, pItem->maRect.Bottom() - nSlim - 1) );
- nCenterPos++;
- SetLineColor( rStyleSettings.GetLightColor() );
-- DrawLine( Point( nCenterPos, pItem->maRect.Top() ),
-- Point( nCenterPos, pItem->maRect.Bottom() ) );
-+ DrawLine( Point( nCenterPos, pItem->maRect.Top() + nSlim),
-+ Point( nCenterPos, pItem->maRect.Bottom() - nSlim) );
- }
- else
- {
-+ nSlim = (pItem->maRect.Right() - pItem->maRect.Left ()) / 4;
- nCenterPos = pItem->maRect.Center().Y()-1;
-- DrawLine( Point( pItem->maRect.Left(), nCenterPos ),
-- Point( pItem->maRect.Right(), nCenterPos ) );
-+ DrawLine( Point( pItem->maRect.Left() + nSlim, nCenterPos),
-+ Point( pItem->maRect.Right() - nSlim, nCenterPos) );
- nCenterPos++;
- SetLineColor( rStyleSettings.GetLightColor() );
-- DrawLine( Point( pItem->maRect.Left(), nCenterPos ),
-- Point( pItem->maRect.Right(), nCenterPos ) );
-+ DrawLine( Point( pItem->maRect.Left() + nSlim, nCenterPos ),
-+ Point( pItem->maRect.Right() - nSlim, nCenterPos ) );
- }
- }
- }
-@@ -3152,14 +3154,11 @@ void ToolBox::ImplDrawItem( USHORT nPos,
- {
-
- Point aArrowPos( nOffX, nOffY );
-- // shadows
-- if( bHighlight == 2 )
-- {
-- aArrowPos.X() -= 2;
-- aArrowPos.Y() -= 2;
-- }
-+#define ARROW_SIZE_HIGHLIGHT 8
-+#define ARROW_SIZE_NO_HIGHLIGHT 6
-
-- aArrowPos.X() += nBtnWidth-6;
-+ int arrow_size = bHighlight ? ARROW_SIZE_HIGHLIGHT : ARROW_SIZE_NO_HIGHLIGHT;
-+ aArrowPos.X() += nBtnWidth - arrow_size;
-
- Color aOldLineColor = GetLineColor();
- Color aOldFillColor = GetFillColor();
-@@ -3200,10 +3199,7 @@ void ToolBox::ImplDrawItem( USHORT nPos,
- if ( !pItem->mbEnabled || !IsEnabled() )
- SetFillColor( rStyleSettings.GetShadowColor() );
- else
-- {
-- SetFillColor( COL_LIGHTGREEN );
-- bBlack = TRUE;
-- }
-+ SetFillColor( rStyleSettings.GetMenuHighlightColor() );
-
- SetClipRegion( aOldRegion );
-
+++ /dev/null
-Index: vcl/unx/source/window/salframe.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
-retrieving revision 1.163
-diff -u -p -u -r1.163 salframe.cxx
---- vcl/unx/source/window/salframe.cxx 1 Jul 2003 14:49:01 -0000 1.163
-+++ vcl/unx/source/window/salframe.cxx 9 Sep 2003 14:24:38 -0000
-@@ -3304,8 +3304,8 @@ long SalFrameData::HandleReparentEvent(
- * note: this works because hWM_Parent is direct child of root,
- * not necessarily parent of GetShellWindow()
- */
-- pFrame_->maGeometry.nX = xp + pFrame_->maGeometry.nLeftDecoration;
-- pFrame_->maGeometry.nY = yp + pFrame_->maGeometry.nTopDecoration;
-+ pFrame_->maGeometry.nX = xp + nLeft;
-+ pFrame_->maGeometry.nY = yp + nTop;
- bool bResized = w != pFrame_->maGeometry.nWidth || h != pFrame_->maGeometry.nHeight;
- pFrame_->maGeometry.nWidth = w;
- pFrame_->maGeometry.nHeight = h;
+++ /dev/null
-
-
- It seems there is no particularly nice way to do this - which
-sucks, presumably that's a result of a lack of code re-use in other
-places. [ taken from the Debian patch ]
-
-
-Index: xmlhelp/source/cxxhelp/provider/urlparameter.cxx
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx,v
-retrieving revision 1.25
-diff -u -p -u -r1.25 urlparameter.cxx
---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx 31 Oct 2001 13:08:14 -0000 1.25
-+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx 17 Jan 2003 16:25:16 -0000
-@@ -266,12 +266,32 @@ rtl::OUString URLParameter::get_title()
-
- return m_aTitle;
- }
--
-+
-
- rtl::OUString URLParameter::get_language()
- {
- if( m_aLanguage.getLength() == 0 )
- return m_aDefaultLanguage;
-+
-+ // Check that we have the necessary files. The rationale is if
-+ // help/<lang>/err.html exists then, we have localized help
-+ // data, possibly not installed. Otherwise, we won't have
-+ // localized help and we try to fallback to English.
-+ rtl::OUString fileURL =
-+ m_pDatabases->getInstallPathAsURL()
-+ + m_pDatabases->lang( m_aLanguage )
-+ + rtl::OUString::createFromAscii( "/err.html" );
-+
-+ osl::DirectoryItem aDirItem;
-+ osl::File aFile( fileURL );
-+ osl::FileStatus aStatus( FileStatusMask_FileSize );
-+
-+ if( osl::FileBase::E_None != osl::DirectoryItem::get( fileURL,aDirItem ) ||
-+ osl::FileBase::E_None != aFile.open( OpenFlag_Read ) ||
-+ osl::FileBase::E_None != aDirItem.getFileStatus( aStatus ) )
-+ {
-+ m_aLanguage = rtl::OUString::createFromAscii( "en-US" );
-+ }
-
- return m_aLanguage;
- }
-Index: xmlhelp/source/treeview/tvread.cxx
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/treeview/tvread.cxx,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 tvread.cxx
---- xmlhelp/source/treeview/tvread.cxx 8 Nov 2001 16:42:46 -0000 1.13
-+++ xmlhelp/source/treeview/tvread.cxx 17 Jan 2003 16:25:16 -0000
-@@ -704,7 +704,27 @@ ConfigData TVChildTarget::init( const Re
- aDirItem ) )
- ret = locale.copy( 0,idx );
-
-- url = url + ret;
-+ rtl::OUString test_url = url + ret;
-+ {
-+ // Check that we have the necessary files. The rationale is if
-+ // help/<lang>/err.html exists then, we have localized help
-+ // data, possibly not installed. Otherwise, we won't have
-+ // localized help and we try to fallback to English.
-+ rtl::OUString errfileURL = test_url + rtl::OUString::createFromAscii( "/err.html" );
-+
-+ osl::DirectoryItem aDirItem;
-+ osl::File aFile( errfileURL );
-+ osl::FileStatus aStatus( FileStatusMask_FileSize );
-+
-+ if( osl::FileBase::E_None != osl::DirectoryItem::get( errfileURL,aDirItem ) ||
-+ osl::FileBase::E_None != aFile.open( OpenFlag_Read ) ||
-+ osl::FileBase::E_None != aDirItem.getFileStatus( aStatus ) )
-+ {
-+ locale = rtl::OUString::createFromAscii( "en-US" );
-+ test_url = url + locale.copy( 0, 2 );
-+ }
-+ }
-+ url = test_url;
-
- // first of all, try do determine whether there are any *.tree files present
-
+++ /dev/null
-Index: svx/inc/globlmn.hrc
-===================================================================
-RCS file: /cvs/graphics/svx/inc/globlmn.hrc,v
-retrieving revision 1.117
-diff -u -p -u -r1.117 globlmn.hrc
---- svx/inc/globlmn.hrc 22 May 2003 08:57:45 -0000 1.117
-+++ svx/inc/globlmn.hrc 4 Jun 2003 10:10:34 -0000
-@@ -5283,10 +5283,6 @@
- {\
- ITEM_HELP_SUPPORTPAGE\
- };\
-- MenuItem\
-- {\
-- ITEM_HELP_ONLINE_REGISTRATION\
-- };\
- MenuItem\
- {\
- Separator = TRUE ; \
-Index: sfx2/source/appl/appserv.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/appserv.cxx,v
-retrieving revision 1.30
-diff -u -p -u -r1.30 appserv.cxx
---- sfx2/source/appl/appserv.cxx 4 Apr 2003 17:33:45 -0000 1.30
-+++ sfx2/source/appl/appserv.cxx 4 Jun 2003 10:13:06 -0000
-@@ -126,6 +126,12 @@
- #ifndef _SV_HELP_HXX
- #include <vcl/help.hxx>
- #endif
-+#ifndef _COM_SUN_STAR_SYSTEM_XSYSTEMSHELLEXECUTE_HPP_
-+#include <com/sun/star/system/XSystemShellExecute.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_SYSTEM_SYSTEMSHELLEXECUTEFLAGS_HPP_
-+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-+#endif
-
- #include <svtools/pathoptions.hxx>
- #include <svtools/helpopt.hxx>
-@@ -602,9 +608,24 @@ void SfxApplication::MiscExec_Impl( SfxR
- break;
- }
-
-+ case SID_HELP_SUPPORTPAGE:
-+ {
-+ try {
-+ Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
-+ ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+ if ( xSystemShell.is()) {
-+ rtl::OUString aURI( DEFINE_CONST_UNICODE( "http://www.pld-linux.org/" ) );
-+ xSystemShell->execute( aURI, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+ }
-+
-+ break;
-+ } catch (const ::com::sun::star::uno::Exception &) {
-+ }
-+ /* drop through on exception */
-+ }
-+
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- case SID_HELPINDEX:
-- case SID_HELP_SUPPORTPAGE:
- {
- Help* pHelp = Application::GetHelp();
- if ( pHelp )
+++ /dev/null
-Index: sc/source/ui/app/scmod2.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/app/scmod2.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 scmod2.cxx
---- sc/source/ui/app/scmod2.cxx 18 Feb 2002 18:03:35 -0000 1.8
-+++ sc/source/ui/app/scmod2.cxx 12 Aug 2003 11:26:55 -0000
-@@ -79,9 +79,6 @@ using namespace com::sun::star;
-
- //------------------------------------------------------------------
-
--//#define LINGUPROP_DEFLOCALE "DefaultLocale"
--//#define LINGUPROP_CJKLOCALE "DefaultLocale_CJK"
--//#define LINGUPROP_CTLLOCALE "DefaultLocale_CTL"
- #define LINGUPROP_AUTOSPELL "IsSpellAuto"
- #define LINGUPROP_HIDEAUTO "IsSpellHide"
-
-Index: sch/source/core/chtmodel.cxx
-===================================================================
-RCS file: /cvs/graphics/sch/source/core/chtmodel.cxx,v
-retrieving revision 1.63
-diff -u -p -u -r1.63 chtmodel.cxx
---- sch/source/core/chtmodel.cxx 1 Nov 2002 14:14:49 -0000 1.63
-+++ sch/source/core/chtmodel.cxx 12 Aug 2003 11:27:03 -0000
-@@ -211,11 +211,6 @@ using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::linguistic2;
-
--#define LINGUPROP_DEFLOCALE "DefaultLocale"
--#define LINGUPROP_CJKLOCALE "DefaultLocale_CJK"
--#define LINGUPROP_CTLLOCALE "DefaultLocale_CTL"
--
--
- /************************************************************************/
-
- /*************************************************************************
+++ /dev/null
-Index: xmlhelp/source/treeview/tvread.cxx
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/treeview/tvread.cxx,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 tvread.cxx
---- xmlhelp/source/treeview/tvread.cxx 8 Nov 2001 16:42:46 -0000 1.13
-+++ xmlhelp/source/treeview/tvread.cxx 14 Oct 2003 16:50:52 -0000
-@@ -2,6 +2,12 @@
- #ifndef _RTL_USTRBUF_HXX_
- #include <rtl/ustrbuf.hxx>
- #endif
-+#ifndef _OSL_PROCESS_H
-+#include <osl/process.h>
-+#endif
-+#ifndef _RTL_LOCALE_HXX
-+#include <rtl/locale.hxx>
-+#endif
- #ifndef _VOS_DIAGNOSE_HXX_
- #include <vos/diagnose.hxx>
- #endif
-@@ -684,7 +690,11 @@ ConfigData TVChildTarget::init( const Re
- rtl::OUString productVersion( setupversion +
- rtl::OUString::createFromAscii( " " ) +
- setupextension );
-+#ifdef UNX
-+ rtl::OUString locale = rtl::OLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) ).getRawName();
-+#else
- rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
-+#endif
-
-
- // Determine fileurl from url and locale
-Index: desktop/source/app/ssoinit.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/app/ssoinit.cxx,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 ssoinit.cxx
---- desktop/source/app/ssoinit.cxx 17 Apr 2003 13:33:29 -0000 1.17
-+++ desktop/source/app/ssoinit.cxx 14 Oct 2003 16:55:04 -0000
-@@ -25,6 +25,9 @@
- #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
- #include <comphelper/processfactory.hxx>
- #endif
-+#ifndef _RTL_LOCALE_HXX_
-+#include <rtl/locale.hxx>
-+#endif
- #ifndef _OSL_PROCESS_H_
- #include <osl/process.h>
- #endif
-@@ -220,6 +223,11 @@ void WriteUserNameToINI( const OUString
-
- LanguageType GetLanguageType( void )
- {
-+#ifdef UNX
-+ return ConvertIsoStringToLanguage(
-+ rtl::OLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) ).getRawName() );
-+#endif
-+
- LanguageType theLanguageType = LANGUAGE_DONTKNOW;
- try
- {
-Index: unotools/source/config/configmgr.cxx
-===================================================================
-RCS file: /cvs/util/unotools/source/config/configmgr.cxx,v
-retrieving revision 1.36
-diff -u -p -u -r1.36 configmgr.cxx
---- unotools/source/config/configmgr.cxx 10 Jun 2003 11:29:10 -0000 1.36
-+++ unotools/source/config/configmgr.cxx 14 Oct 2003 16:55:32 -0000
-@@ -89,6 +89,12 @@
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-+#ifndef _OSL_PROCESS_H_
-+#include <osl/process.h>
-+#endif
-+#ifndef _RTL_LOCALE_HXX_
-+#include <rtl/locale.hxx>
-+#endif
-
- #include <list>
-
-@@ -438,6 +444,19 @@ Any ConfigManager::GetDirectConfigProper
- aRet <<= aXMLFileFormatVersion;
- return aRet;
- }
-+
-+#ifdef UNX
-+ if ( eProp == LOCALE )
-+ {
-+ aRet <<= OLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) ).getRawName();
-+ return aRet;
-+ }
-+ if ( eProp == DEFAULTCURRENCY )
-+ {
-+ aRet <<= OLocale( osl_getSystemLocale( rtl_LocaleSystemCType ) ).getRawName();
-+ return aRet;
-+ }
-+#endif
-
- OUString sPath = C2U(cConfigBaseURL);
- switch(eProp)
-Index: stoc/source/javavm/javavm.cxx
-===================================================================
-RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v
-retrieving revision 1.59
-diff -u -p -u -r1.59 javavm.cxx
---- stoc/source/javavm/javavm.cxx 12 Jun 2003 11:08:36 -0000 1.59
-+++ stoc/source/javavm/javavm.cxx 14 Oct 2003 16:57:24 -0000
-@@ -137,6 +137,8 @@ int main( int argc, char * argv[])
- #include "jvmaccess/virtualmachine.hxx"
- #include "osl/file.hxx"
- #include "osl/thread.h"
-+#include "osl/process.h"
-+#include "rtl/locale.hxx"
- #include "rtl/bootstrap.hxx"
- #include "rtl/process.h"
- #include "rtl/string.h"
-@@ -437,6 +439,9 @@ void getDefaultLocaleFromConfig(stoc_jav
- const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
- const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw(css::uno::Exception)
- {
-+#ifdef UNX
-+ rtl::OUString aLocale = rtl::OLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) ).getRawName();
-+#else
- css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationRegistry")),
- xCtx );
-@@ -450,15 +455,22 @@ void getDefaultLocaleFromConfig(stoc_jav
-
- // read locale
- css::uno::Reference<css::registry::XRegistryKey> locale = xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")));
-- if(locale.is() && locale->getStringValue().getLength()) {
-+ rtl::OUString aLocale;
-+
-+ if(locale.is() && locale->getStringValue().getLength())
-+ aLocale = locale->getStringValue();
-+
-+ xConfRegistry_simple->close();
-+#endif
-+ if (aLocale.getLength()) {
- rtl::OUString language;
- rtl::OUString country;
-
-- sal_Int32 index = locale->getStringValue().indexOf((sal_Unicode) '-');
-+ sal_Int32 index = aLocale.indexOf((sal_Unicode) '-');
-
- if(index >= 0) {
-- language = locale->getStringValue().copy(0, index);
-- country = locale->getStringValue().copy(index + 1);
-+ language = aLocale.copy(0, index);
-+ country = aLocale.copy(index + 1);
-
- if(language.getLength()) {
- rtl::OUString prop(RTL_CONSTASCII_USTRINGPARAM("user.language="));
-@@ -475,8 +487,6 @@ void getDefaultLocaleFromConfig(stoc_jav
- }
- }
- }
--
-- xConfRegistry_simple->close();
- }
-
- void getJavaPropsFromConfig(stoc_javavm::JVM * pjvm,
-Index: svtools/source/config/helpopt.cxx
-===================================================================
-RCS file: /cvs/util/svtools/source/config/helpopt.cxx,v
-retrieving revision 1.12
-diff -u -p -u -r1.12 helpopt.cxx
---- svtools/source/config/helpopt.cxx 27 May 2002 08:44:47 -0000 1.12
-+++ svtools/source/config/helpopt.cxx 14 Oct 2003 17:00:10 -0000
-@@ -85,6 +85,12 @@
- #ifndef _COMPHELPER_STLTYPES_HXX_
- #include <comphelper/stl_types.hxx>
- #endif
-+#ifndef _OSL_PROCESS_H_
-+#include <osl/process.h>
-+#endif
-+#ifndef _RTL_LOCALE_HXX_
-+#include <rtl/locale.hxx>
-+#endif
-
- using namespace utl;
- using namespace rtl;
-@@ -249,7 +255,11 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl
- switch ( nProp )
- {
- case LOCALE:
-+#ifdef UNX
-+ aLocale = rtl::OLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) ).getRawName();
-+#else
- aLocale = aTmpStr;
-+#endif
- break;
-
- case SYSTEM:
-Index: configmgr/source/api2/providerimpl.cxx
-===================================================================
-RCS file: /cvs/util/configmgr/source/api2/providerimpl.cxx,v
-retrieving revision 1.56
-diff -u -p -u -r1.56 providerimpl.cxx
---- configmgr/source/api2/providerimpl.cxx 19 Mar 2003 16:18:36 -0000 1.56
-+++ configmgr/source/api2/providerimpl.cxx 14 Oct 2003 17:01:40 -0000
-@@ -116,6 +116,12 @@
- #ifndef _OSL_INTERLOCK_H_
- #include <osl/interlck.h>
- #endif
-+#ifndef _OSL_PROCESS_H_
-+#include <osl/process.h>
-+#endif
-+#ifndef _RTL_LOCALE_HXX_
-+#include <rtl/locale.hxx>
-+#endif
-
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
- #include <com/sun/star/beans/PropertyValue.hpp>
-@@ -345,6 +351,10 @@ namespace configmgr
- // read the default locale for the user
- if (!m_aDefaultOptions.hasLocale())
- {
-+#ifdef UNX
-+ m_aDefaultOptions.setLocale(
-+ rtl::OLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) ).getRawName() );
-+#else
- using configuration::Name;
- using configuration::makeNodeName;
- static Name ssSubGroup = makeNodeName(OUString(RTL_CONSTASCII_USTRINGPARAM("L10N")), Name::NoValidate());
-@@ -366,6 +376,7 @@ namespace configmgr
- OSL_ENSURE(false, "Could not extract locale parameter into string");
- }
- }
-+#endif
- }
-
- // call the template method
-Index: linguistic/source/lngopt.cxx
-===================================================================
-RCS file: /cvs/sw/linguistic/source/lngopt.cxx,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 lngopt.cxx
---- linguistic/source/lngopt.cxx 25 Jul 2001 10:09:06 -0000 1.11
-+++ linguistic/source/lngopt.cxx 14 Oct 2003 17:04:02 -0000
-@@ -82,6 +82,12 @@
- #ifndef _SV_SYSTEM_HXX
- #include <vcl/system.hxx>
- #endif
-+#ifndef _OSL_PROCESS_H_
-+#include <osl/process.h>
-+#endif
-+#ifndef _RTL_LOCALE_HXX_
-+#include <rtl/locale.hxx>
-+#endif
-
- #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
- #include <cppuhelper/implbase1.hxx> // helper for implementations
-@@ -199,7 +199,13 @@ BOOL LinguOptions::SetValue( Any &rOld,
- case WID_HYPH_MIN_WORD_LENGTH : pnVal = &pData->nHyphMinWordLength; break;
- case WID_DEFAULT_LOCALE :
- {
-- bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal );
-+ Any newVal = rVal;
-+#if UNX
-+ rtl::OLocale aOLocale( osl_getSystemLocale( rtl_LocaleSystemMessages ) );
-+ Locale aLocale( aOLocale.getLanguage(), aOLocale.getCountry(), OUString() );
-+ newVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
-+#endif
-+ bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, newVal );
- break;
- }
- case WID_DEFAULT_LOCALE_CJK :
+++ /dev/null
-Index: sal/util/sal.map
-===================================================================
-RCS file: /cvs/porting/sal/util/sal.map,v
-retrieving revision 1.42
-diff -u -p -u -r1.42 sal.map
---- sal/util/sal.map 4 Apr 2003 10:46:19 -0000 1.42
-+++ sal/util/sal.map 14 Oct 2003 16:43:46 -0000
-@@ -86,6 +86,7 @@ UDK_3_0_0 {
- osl_getSocketOption;
- osl_getSocketType;
- osl_getSymbol;
-+ osl_getSystemLocale;
- osl_getSystemPathFromFileURL;
- osl_getSystemTime;
- osl_getThreadIdentifier;
-Index: sal/inc/rtl/locale.h
-===================================================================
-RCS file: /cvs/porting/sal/inc/rtl/locale.h,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 locale.h
---- sal/inc/rtl/locale.h 26 Apr 2001 13:34:01 -0000 1.3
-+++ sal/inc/rtl/locale.h 14 Oct 2003 16:43:58 -0000
-@@ -130,6 +130,15 @@ rtl_Locale * SAL_CALL rtl_locale_registe
- rtl_Locale * SAL_CALL rtl_locale_getDefault();
-
- /**
-+ As above - but actually useful - and not strangely deprecated,
-+ and with no setter.
-+ */
-+typedef enum {
-+ rtl_LocaleSystemMessages,
-+ rtl_LocaleSystemCType
-+} rtl_LocaleSystemType;
-+
-+/**
- Sets the default.
- Normally set once at the beginning of applet or application,
- then never reset. <code>setDefault</code> does not reset the host locale.
-Index: sal/inc/rtl/locale.hxx
-===================================================================
-RCS file: /cvs/porting/sal/inc/rtl/locale.hxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 locale.hxx
---- sal/inc/rtl/locale.hxx 26 Apr 2001 13:34:01 -0000 1.3
-+++ sal/inc/rtl/locale.hxx 14 Oct 2003 16:43:58 -0000
-@@ -263,6 +263,16 @@ public:
- */
- OUString getVariant() const { return pData->Variant; }
-
-+ /**
-+ Getter for lang-country name
-+ */
-+ inline OUString getRawName()
-+ {
-+ rtl::OUString aRaw = ( getLanguage() +
-+ rtl::OUString::createFromAscii( "-" ) +
-+ getCountry() );
-+ return aRaw;
-+ }
-
- /**
- Returns the hash code of the locale This.
-Index: sal/inc/osl/process.h
-===================================================================
-RCS file: /cvs/porting/sal/inc/osl/process.h,v
-retrieving revision 1.14
-diff -u -p -u -r1.14 process.h
---- sal/inc/osl/process.h 26 Mar 2003 16:45:37 -0000 1.14
-+++ sal/inc/osl/process.h 14 Oct 2003 16:44:16 -0000
-@@ -360,6 +360,8 @@ oslProcessError SAL_CALL osl_getProcessL
- */
-
- oslProcessError SAL_CALL osl_setProcessLocale( rtl_Locale * pLocale );
-+
-+rtl_Locale * SAL_CALL osl_getSystemLocale( rtl_LocaleSystemType nType );
-
-
- sal_Bool SAL_CALL osl_sendResourcePipe(oslPipe Pipe, oslSocket Socket);
-Index: sal/osl/unx/nlsupport.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/nlsupport.c,v
-retrieving revision 1.21
-diff -u -p -u -r1.21 nlsupport.c
---- sal/osl/unx/nlsupport.c 16 Jul 2003 17:21:12 -0000 1.21
-+++ sal/osl/unx/nlsupport.c 14 Oct 2003 16:44:29 -0000
-@@ -1347,3 +1347,46 @@ int _imp_setProcessLocale( rtl_Locale *
- #endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-
-
-+
-+// Get locale of category LC_CTYPE of environment variables
-+static sal_Char* GetLangFromEnvironment()
-+{
-+ static sal_Char* pFallback = "C";
-+ sal_Char *pLang = NULL;
-+
-+ pLang = getenv ( "LC_ALL" );
-+ if (! pLang)
-+ pLang = getenv ( "LC_CTYPE" );
-+ if (! pLang)
-+ pLang = getenv( "LANG" );
-+ if (! pLang)
-+ pLang = pFallback;
-+
-+ return pLang;
-+}
-+
-+rtl_Locale * SAL_CALL osl_getSystemLocale( rtl_LocaleSystemType nType )
-+{
-+ const char *pMessages[] = { "LANGUAGE", "LC_ALL", "LC_MESSAGES", "LANG", NULL };
-+ const char *pCType[] = { "LC_ALL", "LC_CTYPE", NULL };
-+ const char **pScan;
-+ const char *pLang = NULL;
-+ static rtl_Locale *pLocales[2] = { NULL, NULL };
-+
-+ if( !pLocales[ nType ] )
-+ {
-+ pScan = (nType == rtl_LocaleSystemMessages) ? pMessages : pCType;
-+ while (*pScan)
-+ {
-+ if( pLang = getenv( *pScan ) )
-+ break;
-+ pScan++;
-+ }
-+ if( !pLang )
-+ pLang = "C";
-+
-+ pLocales[ nType ] = _parse_locale( pLang );
-+ }
-+
-+ return pLocales[ nType ];
-+}
+++ /dev/null
-Index: tools/source/rc/resmgr.cxx
-===================================================================
-RCS file: /cvs/util/tools/source/rc/resmgr.cxx,v
-retrieving revision 1.24
-diff -u -3 -p -r1.24 resmgr.cxx
---- tools/source/rc/resmgr.cxx 12 Jun 2003 10:31:01 -0000 1.24
-+++ tools/source/rc/resmgr.cxx 6 Nov 2003 16:17:19 -0000
-@@ -1336,7 +1338,8 @@ ResMgr* ResMgr::CreateResMgr( const sal_
- }
- }
-
-- return NULL;
-+ // No resources found - fall back to any language
-+ return SearchCreateResMgr(pPrefixName, nType);
- }
-
- // -----------------------------------------------------------------------
+++ /dev/null
---- oo/i18npool/source/collator/chaptercollator.cxx.orig Fri May 23 18:04:06 2003
-+++ oo/i18npool/source/collator/chaptercollator.cxx Fri May 23 18:04:19 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -110,7 +110,7 @@
- if( ans != 0 )
- return ans;
-
-- OUString &aAddAllowed = OUString::createFromAscii("?");
-+ const OUString &aAddAllowed = OUString::createFromAscii("?");
- ParseResult res1, res2;
- // Bug #100323#, since parseAnyToken does not take length as parameter, we have to copy
- // it to a temp. string.
---- oo/i18npool/source/collator/collatorImpl.cxx.orig Fri May 23 18:08:23 2003
-+++ oo/i18npool/source/collator/collatorImpl.cxx Fri May 23 18:08:56 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -118,7 +118,7 @@
- sal_Int32 SAL_CALL
- CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException)
- {
-- Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
-+ const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
- for (sal_Int16 i = 0; i < imp.getLength(); i++)
- if (imp[i].isDefault)
- return loadCollatorAlgorithm(imp[i].unoID, rLocale, collatorOptions);
-@@ -156,7 +156,7 @@
- CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException)
- {
- nLocale = rLocale;
-- Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
-+ const Sequence< Implementation > &imp = localedata->getCollatorImplementations(rLocale);
- Sequence< OUString > list(imp.getLength());
-
- for (sal_Int32 i = 0; i < imp.getLength(); i++) {
---- oo/i18npool/source/collator/collator_icu.cxx.orig Fri May 23 18:09:27 2003
-+++ oo/i18npool/source/collator/collator_icu.cxx Fri May 23 18:09:40 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -93,8 +93,8 @@
- {
- if (collator) {
- if (tranModules & TransliterationModules_IGNORE_KANA) {
-- OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
-- OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
-+ const OUString& s1 = ignore->transliterateString2String(str1, off1, len1);
-+ const OUString& s2 = ignore->transliterateString2String(str2, off2, len2);
- return collator->compare(s1.getStr(), s1.getLength(), s2.getStr(), s2.getLength());
- }
- else
---- oo/i18npool/source/localedate/localedata.cxx.orig Fri May 23 18:22:59 2003
-+++ oo/i18npool/source/localedate/localedata.cxx Fri May 23 18:23:21 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -273,7 +273,7 @@
- cals = getAllCalendars(loc);
- len = cals.getLength();
- }
-- OUString& id = name.getToken(0, under, index);
-+ const OUString& id = name.getToken(0, under, index);
- for (index = 0; index < cals.getLength(); index++) {
- if (id.equals(cals[index].Name)) {
- ref_cal = cals[index];
---- oo/i18npool/source/transliteration/fullwidthToHalfwidth.cxx.orig Fri May 23 18:24:50 2003
-+++ oo/i18npool/source/transliteration/fullwidthToHalfwidth.cxx Fri May 23 18:25:03 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -90,11 +90,11 @@
- throw(RuntimeException)
- {
- // Decomposition: GA --> KA + voice-mark
-- OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
-+ const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
-
- // One to One mapping
- useOffset = sal_False;
-- OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
-+ const OUString &tmp = transliteration_OneToOne::transliterate( newStr, 0, newStr.getLength(), offset);
- useOffset = sal_True;
- return tmp;
- }
---- oo/i18npool/source/transliteration/halfwidthToFullwidth.cxx.orig Fri May 23 18:25:53 2003
-+++ oo/i18npool/source/transliteration/halfwidthToFullwidth.cxx Fri May 23 18:26:05 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -87,7 +87,7 @@
- sal_Bool _useOffset = useOffset;
- // One to One mapping
- useOffset = sal_False;
-- OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
-+ const OUString& newStr = transliteration_OneToOne::transliterate( inStr, startPos, nCount, offset);
- useOffset = _useOffset;
-
- // Composition: KA + voice-mark --> GA
---- oo/i18npool/source/transliteration/transliterationImpl.cxx.orig Fri May 23 18:26:54 2003
-+++ oo/i18npool/source/transliteration/transliterationImpl.cxx Fri May 23 18:27:16 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -303,7 +303,7 @@
- Sequence<OUString> SAL_CALL
- TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException)
- {
-- Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
-+ const Sequence<OUString> &translist = localedata->getTransliterations(rLocale);
- Sequence<OUString> &r = *new Sequence< OUString > (translist.getLength());
- Reference<XExtendedTransliteration> body;
- sal_Int32 n = 0;
-@@ -532,7 +532,7 @@
- sal_Int32 j_tmp = 0;
- Sequence< OUString > ostr(MaxOutput*length);
- for (sal_Int32 j = 0; j < length; j+=2) {
-- Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
-+ const Sequence< OUString >& temp = bodyCascade[_numCascade]->transliterateRange(inStrs[j], inStrs[j+1]);
-
- for ( sal_Int32 k = 0; k < temp.getLength(); k++) {
- if ( j_tmp >= MaxOutput*length ) throw ERROR;
---- oo/i18npool/source/transliteration/transliteration_commonclass.cxx.orig Fri May 23 18:28:06 2003
-+++ oo/i18npool/source/transliteration/transliteration_commonclass.cxx Fri May 23 18:28:18 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -162,7 +162,7 @@
- {
- static Sequence < sal_Int32 > dummy_offset;
- useOffset = sal_False;
-- OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
-+ const OUString &tmpStr = transliterate(inStr, startPos, nCount, dummy_offset);
- useOffset = sal_True;
- return tmpStr;
- }
---- oo/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx.orig Fri May 23 18:29:09 2003
-+++ oo/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx Fri May 23 18:29:20 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -215,7 +215,7 @@
- }
-
- static
--should_ignore( OUString s )
-+int should_ignore( OUString s )
- {
- // return true if blank or null
- return s.compareToAscii(" ")==0 || (s.getLength()>0 && s[0]==0);
-@@ -346,7 +346,7 @@
- break;
- case TRANSLITERATION:
- try {
-- OUString &tmp = OUString::valueOf( number );
-+ const OUString &tmp = OUString::valueOf( number );
- OUString transliteration;
- getPropertyByName(aProperties, "Transliteration", sal_True) >>= transliteration;
- translit->loadModuleByImplName(transliteration, aLocale);
+++ /dev/null
---- oo/i18nutil/source/utility/tg_compv.mk.orig Fri May 23 15:35:24 2003
-+++ oo/i18nutil/source/utility/tg_compv.mk Fri May 23 15:30:39 2003
-@@ -168,7 +168,7 @@
- .ENDIF
-
- .IF "$(CCNUMVER)"=="000300030000"
--LIBSTDCPP3="5.0.3"
-+LIBSTDCPP3="5.0.4"
- SHORTSTDCPP3="5"
- .ENDIF
-
---- oo/cppu/inc/com/sun/star/uno/Sequence.hxx.orig Fri May 23 17:09:06 2003
-+++ oo/cppu/inc/com/sun/star/uno/Sequence.hxx Fri May 23 17:08:42 2003
-@@ -227,7 +227,7 @@
- if (! ::com::sun::star::uno::Sequence< E >::s_pType)
- {
- const ::com::sun::star::uno::Type & rElementType = ::getCppuType(
-- (::com::sun::star::uno::Sequence< E >::ElementType *)0 );
-+ (typename ::com::sun::star::uno::Sequence< E >::ElementType *)0 );
- ::typelib_static_sequence_type_init(
- & ::com::sun::star::uno::Sequence< E >::s_pType,
- rElementType.getTypeLibType() );
+++ /dev/null
-diff -Nur config_office/configure.in config_office.new/configure.in
---- config_office/configure.in Mon Feb 19 22:11:07 2001
-+++ config_office.new/configure.in Sun Feb 25 18:59:51 2001
-@@ -690,6 +690,9 @@
- if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
- fi
-+ if test "$_os" = "Linux" -a "$_machine_type" = "i586"; then
-+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-+ fi
- if test "$_os" = "FreeBSD"; then
- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
- fi
-@@ -723,6 +726,9 @@
- fi
- if test "$_os" = "Linux"; then
- if test "$_machine_type" = "i686"; then
-+ _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-+ fi
-+ if test "$_machine_type" = "i586"; then
- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
- fi
- if test "$_machine_type" = "sparc"; then
+++ /dev/null
-Index: sd/source/ui/view/viewshel.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/view/viewshel.cxx,v
-retrieving revision 1.22
-diff -u -p -u -r1.22 viewshel.cxx
---- sd/source/ui/view/viewshel.cxx 4 Jun 2003 11:06:02 -0000 1.22
-+++ sd/source/ui/view/viewshel.cxx 30 Sep 2003 14:41:36 -0000
-@@ -121,13 +121,6 @@ SO2_DECL_REF(SvInPlaceObject)
-
- #define DELTA_ZOOM 10
-
--// Use magenta as transparency color instead of the standard gray that is
--// imported from vcl/image.hxx
--#undef IMAGE_STDBTN_COLOR
--#undef IMAGE_STDBTN_COLOR_HC
--#define IMAGE_STDBTN_COLOR Color(0xff,0x00,0xff)
--#define IMAGE_STDBTN_COLOR_HC Color(0xff,0x00,0xff)
--
- /*************************************************************************
- |*
- |* SFX-Slotmap und Standardinterface deklarieren
-Index: sd/source/ui/view/drviewsa.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/view/drviewsa.cxx,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 drviewsa.cxx
---- sd/source/ui/view/drviewsa.cxx 22 May 2003 10:32:31 -0000 1.17
-+++ sd/source/ui/view/drviewsa.cxx 30 Sep 2003 14:45:12 -0000
-@@ -146,13 +146,6 @@ using namespace ::com::sun::star;
-
- BOOL SdDrawViewShell::bPipette = FALSE;
-
--// Use magenta as transparency color instead of the standard gray that is
--// imported from vcl/image.hxx
--#undef IMAGE_STDBTN_COLOR
--#undef IMAGE_STDBTN_COLOR_HC
--#define IMAGE_STDBTN_COLOR Color(0xff,0x00,0xff)
--#define IMAGE_STDBTN_COLOR_HC Color(0xff,0x00,0xff)
--
- // ------------------------
- // - ScannerEventListener -
- // ------------------------
+++ /dev/null
-Index: vcl/source/gdi/bitmapex.cxx
-===================================================================
---- vcl/source/gdi/bitmapex.cxx.orig 2003-04-11 19:28:27.000000000 +0200
-+++ vcl/source/gdi/bitmapex.cxx 2003-10-22 22:42:23.000000000 +0200
-@@ -113,6 +113,12 @@ BitmapEx::BitmapEx( const Bitmap& rBmp )
- eTransparent( TRANSPARENT_NONE ),
- bAlpha ( FALSE )
- {
-+ if (aBitmap.GetBitCount () == 32)
-+ {
-+ eTransparent = TRANSPARENT_BITMAP;
-+ bAlpha = TRUE;
-+ aMask = aBitmap.GetAlphaMask();
-+ }
- }
-
- // ------------------------------------------------------------------
-@@ -124,12 +130,8 @@ BitmapEx::BitmapEx( const Bitmap& rBmp,
- eTransparent ( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ),
- bAlpha ( FALSE )
- {
-- // #105489# Ensure a mask is exactly one bit deep
- if( !!aMask && aMask.GetBitCount() != 1 )
-- {
-- OSL_TRACE("BitmapEx: forced mask to monochrome");
-- aMask.ImplMakeMono( 255 );
-- }
-+ bAlpha = TRUE;
- }
-
- // ------------------------------------------------------------------
-@@ -152,7 +154,13 @@ BitmapEx::BitmapEx( const Bitmap& rBmp,
- eTransparent ( TRANSPARENT_BITMAP ),
- bAlpha ( FALSE )
- {
-- aMask = aBitmap.CreateMask( aTransparentColor );
-+ if( rBmp.GetBitCount() > 24 )
-+ {
-+ aMask = rBmp.GetAlphaMask();
-+ bAlpha = TRUE;
-+ }
-+ else
-+ aMask = aBitmap.CreateMask( aTransparentColor );
- }
-
- // ------------------------------------------------------------------
-@@ -287,12 +295,7 @@ BitmapEx BitmapEx::GetColorTransformedBi
-
- Bitmap BitmapEx::GetMask() const
- {
-- Bitmap aRet( aMask );
--
-- if( IsAlpha() )
-- aRet.ImplMakeMono( 255 );
--
-- return aRet;
-+ return Bitmap( aMask );
- }
-
- // ------------------------------------------------------------------
-@@ -395,7 +398,7 @@ BOOL BitmapEx::Scale( const double& rSca
- bRet = aBitmap.Scale( rScaleX, rScaleY, nScaleFlag );
-
- if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
-- aMask.Scale( rScaleX, rScaleY, BMP_SCALE_FAST );
-+ aMask.Scale( rScaleX, rScaleY, aMask.GetBitCount() == 1 ? BMP_SCALE_FAST : nScaleFlag);
-
- aBitmapSize = aBitmap.GetSizePixel();
- }
+++ /dev/null
-Index: desktop/source/splash/splash.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/splash/splash.cxx,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 splash.cxx
---- desktop/source/splash/splash.cxx 15 Jul 2003 14:06:11 -0000 1.4
-+++ desktop/source/splash/splash.cxx 1 Oct 2003 12:49:29 -0000
-@@ -227,7 +227,7 @@ void SplashScreen::initBitmap()
- // any language specific information, we have to search for the correct resource
- // file. The bitmap resource is language independent.
- const USHORT nResId = RID_DEFAULTINTRO;
-- LanguageType aLanguageType;
-+ LanguageType aLanguageType = LANGUAGE_DONTKNOW;
- String aMgrName = String::CreateFromAscii( "iso" );
- aMgrName += String::CreateFromInt32(SUPD); // current build version
- ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLanguageType );
-Index: desktop/source/app/app.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/app/app.cxx,v
-retrieving revision 1.121.10.1
-diff -u -p -u -r1.121.10.1 app.cxx
---- desktop/source/app/app.cxx 15 Aug 2003 11:56:47 -0000 1.121.10.1
-+++ desktop/source/app/app.cxx 1 Oct 2003 12:49:30 -0000
-@@ -1335,7 +1336,7 @@ void Desktop::Main()
-
- // create title string
- sal_Bool bCheckOk = sal_False;
-- LanguageType aLanguageType;
-+ LanguageType aLanguageType = LANGUAGE_DONTKNOW;
- String aMgrName = String::CreateFromAscii( "iso" );
- aMgrName += String::CreateFromInt32(SUPD); // current build version
- ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLanguageType );
+++ /dev/null
-Index: sw/source/core/sw3io/sw3imp.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/sw3io/sw3imp.cxx,v
-retrieving revision 1.20
-diff -u -p -u -r1.20 sw3imp.cxx
---- sw/source/core/sw3io/sw3imp.cxx 4 Jul 2003 13:23:43 -0000 1.20
-+++ sw/source/core/sw3io/sw3imp.cxx 3 Oct 2003 08:06:03 -0000
-@@ -360,6 +360,7 @@ Sw3IoImp::Sw3IoImp( Sw3Io& r )
- pRefSdrObjects = 0;
- #endif
- hBatsFontConv = 0;
-+ hMathFontConv = 0;
- Reset();
-
- {
+++ /dev/null
---- oo_1.0_src/svtools/source/svhtml/htmlout.cxx.jj Thu Nov 29 12:41:03 2001
-+++ oo_1.0_src/svtools/source/svhtml/htmlout.cxx Fri Jul 12 21:16:44 2002
-@@ -392,6 +392,15 @@ void lcl_ConvertCharToHTML( sal_Unicode
- break;
- }
-
-+ // Don't uglify ISO-8859-2 output unnecessarily
-+ if( pStr && pStr[0] && eDestEnc == RTL_TEXTENCODING_ISO_8859_2 )
-+ {
-+ if( !strcmp( pStr + 1, "acute" ) && strchr( "iIyYaAeEoOuU", pStr[0] ) )
-+ pStr = 0;
-+ else if( !strcmp( pStr + 1, "caron" ) && ( pStr[0] == 's' || pStr[0] == 'S' ) )
-+ pStr = 0;
-+ }
-+
- if( pStr )
- {
- ((rDest += '&') += pStr) += ';';
+++ /dev/null
---- oo_1.1rc3_src/odk/source/bean/native/unix/makefile.mk.orig Thu Jul 31 19:12:20 2003
-+++ oo_1.1rc3_src/odk/source/bean/native/unix/makefile.mk Wed Sep 3 10:07:05 2003
-@@ -25,7 +25,7 @@
-
- SHL1TARGET=$(TARGET)
- SHL1LIBS= $(SLB)$/$(TARGET).lib
--SHL1STDLIBS=-ljawt -lsal
-+SHL1STDLIBS=-ljawt -lsal -lhpi
-
- .IF "$(OS)" == "LINUX"
- .IF "$(CPUNAME)" == "S390"
+++ /dev/null
---- javaunohelper/source/makefile.mk.orig 2003-09-22 12:14:58.000000000 -0700
-+++ javaunohelper/source/makefile.mk 2003-09-22 12:18:51.000000000 -0700
-@@ -76,6 +76,8 @@
-
- # ------------------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
- UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-@@ -153,6 +155,8 @@
-
- DEF2NAME=$(SHL2TARGET)
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
+++ /dev/null
---- oo_641_src/config_office/configure.in Wed Dec 19 02:28:41 2001
-+++ oo_641_src/config_office/configure.in.new Wed Dec 19 02:25:43 2001
-@@ -654,6 +654,22 @@
- _jdk_minor="true"
- fi
- fi
-+ if test "$_os" = "Linux" -a "$_machine_type" = "i586"; then
-+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+
-+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-+ _jdk_minor="true"
-+ fi
-+ fi
-+ if test "$_os" = "Linux" -a "$_machine_type" = "i386"; then
-+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
-+
-+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
-+ _jdk_minor="true"
-+ fi
-+ fi
- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
- _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
- fi
-@@ -686,6 +702,12 @@
- if test "$_machine_type" = "i686"; then
- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
- fi
-+ if test "$_machine_type" = "i586"; then
-+ _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-+ fi
-+ if test "$_machine_type" = "i386"; then
-+ _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
-+ fi
- if test "$_machine_type" = "sparc"; then
- _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
- fi
+++ /dev/null
---- bridges/source/jni_uno/makefile.mk.orig 2003-09-22 12:34:56.000000000 -0700
-+++ bridges/source/jni_uno/makefile.mk 2003-09-22 12:36:30.000000000 -0700
-@@ -72,6 +72,8 @@
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- SLOFILES= \
- $(SLO)$/jni_info.obj \
- $(SLO)$/jni_data.obj \
-@@ -99,6 +101,8 @@
- .ENDIF
- .ENDIF
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
+++ /dev/null
---- jurt/source/pipe/makefile.mk.orig 2003-09-22 12:38:16.000000000 -0700
-+++ jurt/source/pipe/makefile.mk 2003-09-22 12:39:08.000000000 -0700
-@@ -15,6 +15,8 @@
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- SLOFILES = \
- $(SLO)$/com_sun_star_lib_connections_pipe_PipeConnection.obj
-
-@@ -29,6 +31,8 @@
-
- NO_SHL1DESCRIPTION=TRUE
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
+++ /dev/null
---- jvmaccess/source/makefile.mk.orig 2003-09-22 12:40:14.000000000 -0700
-+++ jvmaccess/source/makefile.mk 2003-09-22 12:41:58.000000000 -0700
-@@ -67,6 +67,8 @@
-
- .INCLUDE: settings.mk
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface
-
- UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb
-@@ -80,4 +82,6 @@
- $(SLO)$/virtualmachine.obj \
- $(SLO)$/windows.obj
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- .INCLUDE: target.mk
---- jvmaccess/util/makefile.mk.orig 2003-09-22 12:40:19.000000000 -0700
-+++ jvmaccess/util/makefile.mk 2003-09-22 12:41:35.000000000 -0700
-@@ -71,6 +71,8 @@
-
- .INCLUDE: settings.mk
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- .IF "$(UNIXVERSIONNAMES)" == ""
- SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
- .ELSE # UNIXVERSIONNAMES
-@@ -96,4 +98,6 @@
-
- DEF1NAME = $(SHL1TARGET)
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- .INCLUDE: target.mk
+++ /dev/null
-01:en:ENUS:English US:english:
-03:pt:PORT:Portuguese:portuguese:por
-07:ru:RUSS:Russian:russian:rus
-30:el:GREEK:Greek:greek:gre
-31:nl:DTCH:Dutch:dutch:dut
-33:fr:FREN:French:french:fre
-34:es:SPAN:Spanish:spanish:spa
-35:fi:FINN:Finnish:finnish:fin
-37:ca:CAT:Catalan:catalan:cat
-39:it:ITAL:Italian:italian:ita
-42:cs:CZECH:Czech:czech:cze
-43:sk:SLOVAK:Slovak:slovak:slk
-45:da:DAN:Danish:danish:dan
-46:sv:SWED:Swedish:swedish:swe
-48:pl:POL:Polish:polish:pol
-49:de:GERM:German:german:ger
-81:ja:JAPN:Japanese:japanese:jap
-82:ko:KOREAN:Korean:korean:kor
-86:zh-CN:CHINSIM:Chinese Simplified:chinese_simplified:
-88:zh-TW:CHINTRAD:Chinese Traditional:chinese_traditional:
-90:tr:TURK:Turkish:turkish:tur
-96:ar:ARAB:Arabic:arabic:ara
+++ /dev/null
-diff -Nur oo/connectivity/source/drivers/mozab/makefile.mk oo.new/connectivity/source/drivers/mozab/makefile.mk
---- oo/connectivity/source/drivers/mozab/makefile.mk Mon Mar 11 16:07:41 2002
-+++ oo.new/connectivity/source/drivers/mozab/makefile.mk Sun Apr 21 14:35:50 2002
-@@ -92,13 +92,13 @@
- ENABLE_EXCEPTIONS=TRUE
- LDUMP=ldump2.exe
- # --- Settings ----------------------------------
--.IF "$(DBGUTIL_OJ)"!=""
--ENVCFLAGS+=/FR$(SLO)$/
--.ENDIF
-+#.IF "$(DBGUTIL_OJ)"!=""
-+#ENVCFLAGS+=/FR$(SLO)$/
-+#.ENDIF
-
--.INCLUDE : settings.mk
-+#.INCLUDE : settings.mk
-
--.INCLUDE : $(PRJ)$/version.mk
-+#.INCLUDE : $(PRJ)$/version.mk
-
-
- # --- Recursiveness ---------------------------------------------------
-@@ -114,10 +114,10 @@
-
- # --- MOZAB BASE Library -----------------------------------
-
--SHL1VERSIONMAP= $(TARGET).map
--.IF "$(OS)"!="FREEBSD"
--SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
--.ENDIF
-+#SHL1VERSIONMAP= $(TARGET).map
-+#.IF "$(OS)"!="FREEBSD"
-+#SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-+#.ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- $(CPPULIB) \
-@@ -188,27 +188,27 @@
-
- # --- Targets ----------------------------------
-
--.INCLUDE : target.mk
-+#.INCLUDE : target.mk
-
- # --- filter file ------------------------------
-
--.IF "$(depend)"==""
-+#.IF "$(depend)"==""
-
--$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-- @echo ------------------------------
-- @echo CLEAR_THE_FILE > $@
-- @echo _TI >>$@
-- @echo _real >>$@
--.ENDIF
--
--.IF "$(depend)"==""
--
--$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-- @echo ------------------------------
-- @echo CLEAR_THE_FILE > $@
-- @echo _TI >>$@
-- @echo _real >>$@
--.ENDIF
-+#$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+# @echo ------------------------------
-+# @echo CLEAR_THE_FILE > $@
-+# @echo _TI >>$@
-+# @echo _real >>$@
-+#.ENDIF
-+
-+#.IF "$(depend)"==""
-+
-+#$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-+# @echo ------------------------------
-+# @echo CLEAR_THE_FILE > $@
-+# @echo _TI >>$@
-+# @echo _real >>$@
-+#.ENDIF
-
- killdpc:
- -+$(RM) $(DPCTARGET)
-@@ -106,10 +106,10 @@
-
- # --- MOZAB BASE Library -----------------------------------
-
--SHL1VERSIONMAP= $(TARGET).map
--.IF "$(OS)"!="FREEBSD"
--SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
--.ENDIF
-+#SHL1VERSIONMAP= $(TARGET).map
-+#.IF "$(OS)"!="FREEBSD"
-+#SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
-+#.ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
- $(CPPULIB) \
-@@ -180,27 +180,27 @@
-
- # --- Targets ----------------------------------
-
--.INCLUDE : target.mk
-+#.INCLUDE : target.mk
-
- # --- filter file ------------------------------
-
--.IF "$(depend)"==""
-+#.IF "$(depend)"==""
-
--$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-- @echo ------------------------------
-- @echo CLEAR_THE_FILE > $@
-- @echo _TI >>$@
-- @echo _real >>$@
--.ENDIF
--
--.IF "$(depend)"==""
--
--$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-- @echo ------------------------------
-- @echo CLEAR_THE_FILE > $@
-- @echo _TI >>$@
-- @echo _real >>$@
--.ENDIF
-+#$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+# @echo ------------------------------
-+# @echo CLEAR_THE_FILE > $@
-+# @echo _TI >>$@
-+# @echo _real >>$@
-+#.ENDIF
-+
-+#.IF "$(depend)"==""
-+
-+#$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-+# @echo ------------------------------
-+# @echo CLEAR_THE_FILE > $@
-+# @echo _TI >>$@
-+# @echo _real >>$@
-+#.ENDIF
-
- killdpc:
- -+$(RM) $(DPCTARGET)
+++ /dev/null
-diff -Nur oo/solenv/inc/unxlngi3.mk oo.new/solenv/inc/unxlngi3.mk
---- oo/solenv/inc/unxlngi3.mk Fri Apr 19 18:59:59 2002
-+++ oo.new/solenv/inc/unxlngi3.mk Sun Apr 21 20:13:28 2002
-@@ -85,9 +85,9 @@
- .ENDIF
-
- # name of C++ Compiler
--CC=g++
-+CC=g++2
- # name of C Compiler
--cc=gcc
-+cc=gcc2
- # flags for C and C++ Compiler
- # do not use standard header search paths
- # if installed elsewhere
-@@ -135,7 +135,7 @@
- DYNAMIC = -Wl,-Bdynamic
-
- # name of linker
--LINK=gcc
-+LINK=gcc2
- # default linker flags
- LINKFLAGS=
-
+++ /dev/null
-diff -uNr jscpp.bak/makefile.mk jscpp/makefile.mk
---- oo_1.0_src/sj2/source/jscpp.bak/makefile.mk Wed Dec 4 00:26:56 2002
-+++ oo_1.0_src/sj2/source/jscpp/makefile.mk Thu Dec 5 18:34:06 2002
-@@ -2,9 +2,9 @@
- #
- # $RCSfile$
- #
--# $Revision$
-+# $Revision$
- #
--# last change: $Author$ $Date$
-+# last change: $Author$ $Date$
- #
- # The Contents of this file are made available subject to the terms of
- # either of the following licenses
-@@ -68,10 +68,6 @@
-
- .INCLUDE : $(PRJ)$/util$/makefile.pmk
-
--UNOUCRDEP=$(SOLARBINDIR)$/applicat.rdb
--UNOUCRRDB=$(SOLARBINDIR)$/applicat.rdb
--UNOUCROUT=$(OUT)$/inc
--
- # --- Files --------------------------------------------------------
-
- UNOTYPES= \
-diff -uNr jscpp.bak/sjapplet_impl.cxx jscpp/sjapplet_impl.cxx
---- oo_1.0_src/sj2/source/jscpp.bak/sjapplet_impl.cxx Tue Feb 19 12:36:18 2002
-+++ oo_1.0_src/sj2/source/jscpp/sjapplet_impl.cxx Thu Dec 5 18:34:06 2002
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -133,10 +133,10 @@
- pEnv->CallStaticObjectMethod(jcToolkit, jmToolkit_getDefaultToolkit); testJavaException(pEnv);
-
- jclass jcMotifAppletViewer = pEnv->FindClass(
-- "sun/plugin/navig/motif/MotifAppletViewer"); testJavaException(pEnv);
-+ "sun/plugin/navig/motif/MotifAppletViewer");
- if(pEnv->ExceptionOccurred())
- {
-- pEnv->ExceptionClear();
-+ pEnv->ExceptionClear();
- jcMotifAppletViewer = pEnv->FindClass(
- "sun/plugin/viewer/MNetscapePluginContext"); testJavaException(pEnv);
- }
-@@ -226,11 +226,11 @@
- if (_joAppletExecutionContext) {
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
-- _pEmbeddedWindow->dispose(jenv.pEnv);
-- delete _pEmbeddedWindow;
-+ _pEmbeddedWindow->dispose(jenv.pEnv);
-+ delete _pEmbeddedWindow;
-
-- jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
-- jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
-+ jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
-+ jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
- }
- }
-
-@@ -244,7 +244,7 @@
-
-
- // Java URL erzeugen
-- OUString url = rDocBase.GetMainURL();
-+ OUString url = rDocBase.GetMainURL(INetURLObject::DECODE_TO_IURI);
-
- if(!url.getLength())
- url = OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
-@@ -340,6 +340,7 @@
- joDocBase, joParameters, _pEmbeddedWindow->_joWindow, (jlong)0); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_init); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_startUp); testJavaException(jenv.pEnv);
-+
- }
-
- void SjApplet2_Impl::setSize(const Size & rSize) throw(com::sun::star::uno::RuntimeException)
-@@ -391,6 +392,11 @@
-
- jmethodID jmAppletExecutionContext_shutdown = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "shutdown", "()V"); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_shutdown); testJavaException(jenv.pEnv);
-+
-+ jmethodID jmWaitForDispose= jenv.pEnv->GetMethodID(_jcAppletExecutionContext,"waitForDispose","()V");
-+ testJavaException(jenv.pEnv);
-+ //blocks until the applet has destroyed itself and the container was disposed (stardiv.applet.AppletExecutionContext.dispose)
-+ jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmWaitForDispose);
-
- if( _pParentWin )
- {
+++ /dev/null
---- oo_641c_src/connectivity/prj/build.lst.no-mozab Tue Dec 11 18:14:02 2001
-+++ oo_641c_src/connectivity/prj/build.lst Wed Feb 20 14:22:33 2002
-@@ -7,8 +7,6 @@
- cn connectivity\source\resource nmake - all cn_res NULL
- cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
- cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
--cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
--cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
- cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
- cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
- cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
+++ /dev/null
---- oo/scp/source/office/files.scp.orig Fri May 9 14:18:37 2003
-+++ oo/scp/source/office/files.scp Sat May 24 21:59:07 2003
-@@ -433,19 +433,6 @@
- Styles = (PACKED);
- End
-
--#ifndef MACOSX
--File GID_FILE_LIB_MOZABDRV
-- TXT_FILE_BODY;
-- #ifdef UNX
-- Name = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
-- #else
-- Name = "mozabdrv2.dll";
-- #endif
-- Dir = GID_DIR_PROGRAM;
-- Styles = (PACKED);
--End
--#endif
--
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
-
-@@ -795,20 +782,6 @@
- #endif
- End
-
--#ifndef MACOSX
--File GID_FILE_LIB_MOZAB_2
-- TXT_FILE_BODY;
-- Styles = (PACKED,UNO_COMPONENT);
-- RegistryID = GID_STARREGISTRY_SERVICES_RDB;
-- Dir = GID_DIR_PROGRAM;
-- #ifdef UNX
-- Name = STRING(CONCAT2(libmozab2,UNXSUFFIX));
-- #else
-- Name = "mozab2.dll";
-- #endif
--End
--#endif
--
- #ifdef UNX
-
- File GID_FILE_LIB_EVOAB_1
-@@ -3242,15 +3215,6 @@
-
- #endif
- // of #ifdef SOLAR_JAVA
--#ifndef MACOSX
--File GID_FILE_MOZILLA_RUNTIME
-- TXT_FILE_BODY;
-- Styles = (ARCHIVE);
-- Dir = GID_DIR_PROGRAM;
-- Name = "mozruntime.zip";
--End
--#endif
--
- File GID_FILE_HTML_THIRDPARTYLICENSEREADME
- Name = "THIRDPARTYLICENSEREADME.html";
- Dir = PREDEFINED_PROGDIR;
+++ /dev/null
---- oo_641c_src/scp/source/global/setupzip.scp Wed Nov 21 12:27:20 2001
-+++ oo_641c_src-new/scp/source/global/setupzip.scp Tue Jan 29 15:35:37 2002
-@@ -128,6 +128,7 @@
- UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_SVL, svl )
- UNO_SETUPZIP_LIB_FILE( GID_FILE_LIB_UUI, uui )
-
-+#ifdef NOTHING
- #endif
-
- File GID_FILE_LIB_STLPORT
-@@ -149,6 +150,8 @@
- #endif
- End
-
-+#endif
-+
- #if !defined(OSL_PRODUCT)
-
- File GID_FILE_LIB_COLLATOR
+++ /dev/null
-diff -Nur oo_641_src/config_office/configure.in oo_641_src.new/config_office/configure.in
---- oo_641_src/config_office/configure.in Mon Nov 12 22:45:53 2001
-+++ oo_641_src.new/config_office/configure.in Sun Dec 16 03:12:50 2001
-@@ -23,13 +23,6 @@
-
- Usage: --with-gcc-home=<absolute path to gcc home>
- ],,)
--AC_ARG_WITH(stlport4-home,
--[ --with-stlport4-home The location that STLport4 is installed in. The STL
-- header files are assumed to be in stlport4-home/stlport
-- and the STLport4 library in stlport4-home/lib.
--
-- Usage: --with-stlport4-home=<absolute path to stlport4 home>
--],,)
- AC_ARG_WITH(jdk-home,
- [ --with-jdk-home if you have installed JDK 1.2.2, on your system,
- please supply the path here.
-@@ -104,12 +97,7 @@
-
- Usage: --with-unzip-home=<path to unzip.exe directory>
- ],,)
--AC_ARG_ENABLE(sgistl,
--[ --enable-sgistl for IRIX users, use this option option to build OpenOffice
-- using SGI's STL.
-
-- Usage: --enable-check-only=yes
--],,)
- dnl ===================================================================
- dnl Message.
- dnl ===================================================================
-@@ -526,7 +514,6 @@
- AC_MSG_RESULT([checked])
- fi
- fi
--
- dnl **************************************************************
- dnl Testing for required Solaris and workshop compiler patches...
- dnl **************************************************************
-@@ -639,77 +626,6 @@
- fi
-
- dnl ===================================================================
--dnl Checks for SGI STL
--dnl ===================================================================
--if test -n "$enable_sgistl"; then
-- if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-- AC_MSG_CHECKING([for SGI STL])
-- if test -d /usr/include/CC ; then
-- AC_MSG_RESULT([yes.])
--
-- else
-- AC_MSG_RESULT([not found.])
-- fi
-- else
-- AC_MSG_ERROR([IRIX not found.])
-- fi
--else
--
--dnl ===================================================================
--dnl Checks for STLPORT4
--dnl ===================================================================
--AC_MSG_CHECKING([for STLport4 headers])
--if test -d "$with_stlport4_home"; then
-- STLPORT4=$with_stlport4_home
-- if test "$_os" != "WINNT"; then
-- AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.]))
-- else
-- dnl AC_TRY_CPP doesn't work on Windows because C++ preprocessor is not found by autoconf.
-- if test -f "$STLPORT4/stlport/hash_map"; then
-- AC_MSG_RESULT([checked.])
-- else
-- AC_MSG_ERROR([STLport4 headers not found.])
-- fi
-- fi
-- if test "$_os" != "WINNT"; then
-- AC_MSG_CHECKING([for STLport4 libraries])
-- if test "$_os" = "SunOS"; then
-- if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
-- AC_MSG_RESULT([checked])
-- else
-- AC_MSG_ERROR([STLport4 libraries not found])
-- fi
-- elif test "$_os" = "Darwin"; then
-- if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-- AC_MSG_RESULT([checked])
-- else
-- AC_MSG_ERROR([STLport4 libraries not found])
-- fi
-- elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-- if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
-- AC_MSG_RESULT([checked])
-- else
-- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-- AC_MSG_RESULT([checked])
-- else
-- AC_MSG_ERROR([STLport4 libraries not found])
-- fi
-- fi
-- else
-- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-- AC_MSG_RESULT([checked])
-- else
-- AC_MSG_ERROR([STLport4 libraries not found])
-- fi
-- fi
-- fi
--else
-- AC_MSG_WARN([No STLPORT4 directory specified with the --with-stlport4-home option. Will build the one provided.])
--dnl AC_MSG_ERROR([No STLPORT4 directory found. You must use the --with-stlport4-home option.])
--fi
--
--fi
--dnl ===================================================================
- dnl Checks for JDK.
- dnl ===================================================================
- JAVA_HOME=; export JAVA_HOME
-@@ -1016,7 +932,7 @@
- TCSH="NO_TCSH"
- fi
- if test -z "$STLPORT4"; then
-- STLPORT4="NO_STLPORT4"
-+ STLPORT4="/no/_/stlport4"
- fi
- if test -z "$PERL"; then
- PERL="NO_PERL"
-diff -Nur oo_641_src/config_office/set_soenv.1 oo_641_src.new/config_office/set_soenv.1
---- oo_641_src/config_office/set_soenv.1 Tue Nov 20 18:26:33 2001
-+++ oo_641_src.new/config_office/set_soenv.1 Sun Dec 16 03:22:36 2001
-@@ -588,7 +588,7 @@
- { if ( $ARGV[ 0 ] eq $no_gcc)
- { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
- printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
-- my $answer = <STDIN>;
-+ my $answer = "n";
- chomp( $answer );
- if ( $answer eq "y" || $answer eq "Y" )
- { $GCC_HOME = GetValue( "Please enter the gcc 2.95.2 --prefix value: " );
-diff -Nur oo_641_src/solenv/inc/unxlngi3.mk oo_641_src.new/solenv/inc/unxlngi3.mk
---- oo_641_src/solenv/inc/unxlngi3.mk Fri Oct 19 17:27:08 2001
-+++ oo_641_src.new/solenv/inc/unxlngi3.mk Sun Dec 16 02:49:45 2001
-@@ -91,10 +91,7 @@
- # flags for C and C++ Compiler
- # do not use standard header search paths
- # if installed elsewhere
--.IF "$(BUILD_SOSL)"!=""
--CFLAGS=-nostdinc
--.ENDIF
--CFLAGS+=-c $(INCLUDE)
-+CFLAGS=-c $(INCLUDE)
- # flags for the C++ Compiler
- CFLAGSCC= -pipe -mpentiumpro
- # Flags for enabling exception handling
-@@ -185,8 +182,8 @@
- STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -ldl -lpthread -lm
- STDSHLCUIMT=-ldl -lpthread -lm
-
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+LIBSTLPORT=$(DYNAMIC) $(STDLIBCPP)
-+LIBSTLPORTST=$(STATIC) $(STDLIBCPP) $(DYNAMIC)
-
-
- # name of library manager
-diff -Nur oo_641_src/stlport/makefile.mk oo_641_src.new/stlport/makefile.mk
---- oo_641_src/stlport/makefile.mk Mon Nov 19 18:06:09 2001
-+++ oo_641_src.new/stlport/makefile.mk Sun Dec 16 03:34:28 2001
-@@ -70,7 +70,7 @@
- @echo " An already available installatin of STLport has been chosen in the configure process."
- @echo " Therefore the version provided here does not need to be built in addition."
-
-- +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
-+# +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
- .ENDIF
-
- # --- Settings -----------------------------------------------------
+++ /dev/null
---- oo_1.0_src/config_office/set_soenv.1.bero Wed Jun 12 11:11:16 2002
-+++ oo_1.0_src/config_office/set_soenv.1 Wed Jun 12 11:12:59 2002
-@@ -1193,10 +1193,7 @@
-
- if (($platform eq "$Solaris") or ($platform eq "$Linux") or ($platform eq "$Tru64") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
- {
--if ( ($platform ne "$Irix") and ($platform ne "$Irix64") )
--{
-- $SOLARINC .= $I.$USR.$INCLUDE;
--}
-+$SOLARINC .= $I.'$JAVA_HOME'.$INCLUDE;
- $SOLARINC .= $STLPORT_stlport;
- if ($platform eq "$Linux")
- {
-@@ -1217,50 +1213,17 @@
- # This simply adds an include path, so even cases that break the FHS work
- $SOLARINC .= $STLPORT_inc_stlport;
- }
--$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
-- $I.'$JAVA_HOME'.$INCLUDE;
--
--#include system dependent Java include directory
--
--if ($platform eq "$Solaris")
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
--}
--elsif (($platform eq "$Linux") or ($platform eq "$Tru64"))
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
--}
--elsif ($platform eq "$FreeBSD")
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
--}
--elsif ($platform eq "$NetBSD")
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
--}
--elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
--}
--
--#java threads include path
--
--if ($platform eq "$FreeBSD")
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
--}
--else
--{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
--}
-+$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31";
-
- #The tail, if needed
- if (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD"))
--{ $SOLARINC .= $I.$XINC.
-- $I.$GCC_INCLUDE.
-- $I.$USR.$INCLUDE;
-+{ $SOLARINC .= $I.$XINC;
- }
- elsif ($platform eq "$Tru64")
--{ $SOLARINC .= $I.$XINC.
-- $I.$USR.$INCLUDE;
-+{ $SOLARINC .= $I.$XINC;
- }
- elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
--{ $SOLARINC .= $I.$GCC_INCLUDE.
-- $I.$GXX_INCLUDE.
-- $I.$XINC;
-+{ $SOLARINC .= $I.$XINC;
- }
- #add a '"' at the end
- $SOLARINC .= '"';
+++ /dev/null
-Index: odk/pack/gendocu/makefile.mk
-===================================================================
-RCS file: /cvs/api/odk/pack/gendocu/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- odk/pack/gendocu/makefile.mk 10 Jun 2003 10:50:52 -0000 1.5
-+++ odk/pack/gendocu/makefile.mk 31 Oct 2003 16:36:18 -0000
-@@ -117,9 +117,13 @@
-
- MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc
-
-+.IF "$(SOLAR_JAVA)"!=""
- all: \
- $(CPP_DOCU_INDEX_FILE) \
- $(JAVA_DOCU_INDEX_FILE)
-+.ELSE
-+all: $(CPP_DOCU_INDEX_FILE)
-+.ENDIF
-
- $(CPP_DOCU_INDEX_FILE) : $(INCLUDELIST)
- +-$(MKDIRHIER) $(@:d)
-@@ -140,6 +144,8 @@
- # +$(MY_COPY) $< $@
-
- #$(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA_DOCU_INDEX_FILE) : $(JAVA_SRC_FILES)
- +-$(MKDIRHIER) $(@:d)
- +javadoc -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
-+.ENDIF
-Index: odk/source/OOSupport/makefile.mk
-===================================================================
-RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v
-retrieving revision 1.9.40.1
-diff -u -r1.9.40.1 makefile.mk
---- odk/source/OOSupport/makefile.mk 15 Aug 2003 11:34:29 -0000 1.9.40.1
-+++ odk/source/OOSupport/makefile.mk 31 Oct 2003 16:36:18 -0000
-@@ -72,14 +72,16 @@
-
- .INCLUDE : settings.mk
-
--# Files --------------------------------------------------------
--
-+.IF "$(SOLAR_JAVA)"==""
-+nojava:
-+ @echo "Not building odk/source/OOSupport because Java has been disabled"
-+.ENDIF
- .IF "$(OS)"=="MACOSX"
--
- dummy:
- @echo "Nothing to build for OS $(OS)"
-+.ENDIF
-
--.ELSE # "$(OS)"=="MACOSX"
-+# Files --------------------------------------------------------
-
- JARFILES = $(JARPATH)$/ridl.jar$(PATH_SEPERATOR)$(JARPATH)$/juh.jar$(PATH_SEPERATOR)$(JARPATH)$/jurt.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jarpackager.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/openide.jar$(PATH_SEPERATOR)$(JARPATH)$/jakarta-regexp-1.2.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/nbantext.jar$(PATH_SEPERATOR)$(JARCOMMONPATH)$/jhall.jar
-
-@@ -346,5 +348,3 @@
- +-mkdir $(CLASSDIR)$/netbeans$/modules
- +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule
- +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
--
--.ENDIF
-Index: odk/source/bean/native/unix/makefile.mk
-===================================================================
-RCS file: /cvs/api/odk/source/bean/native/unix/makefile.mk,v
-retrieving revision 1.9.26.1
-diff -u -r1.9.26.1 makefile.mk
---- odk/source/bean/native/unix/makefile.mk 15 Aug 2003 11:34:48 -0000 1.9.26.1
-+++ odk/source/bean/native/unix/makefile.mk 31 Oct 2003 16:36:18 -0000
-@@ -12,12 +12,14 @@
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"=="" || "$(OS)"=="MACOSX"
-+nojava:
-+ @echo "Not building odk/source/OOSupport because Java has been disabled"
-+.ENDIF
- .IF "$(OS)"=="MACOSX"
--
- dummy:
- @echo "Nothing to build for OS $(OS)"
--
--.ELSE # "$(OS)"=="MACOSX"
-+.ENDIF
-
- SLOFILES = \
- $(SLO)$/com_sun_star_beans_LocalOfficeWindow.obj
-@@ -35,8 +37,6 @@
- .ENDIF
-
- NO_SHL1DESCRIPTION=TRUE
--
--.ENDIF
-
- # --- Targets ------------------------------------------------------
-
-Index: odk/util/check.pl
-===================================================================
-RCS file: /cvs/api/odk/util/check.pl,v
-retrieving revision 1.3
-diff -u -r1.3 check.pl
---- odk/util/check.pl 30 Jun 2003 16:02:17 -0000 1.3
-+++ odk/util/check.pl 31 Oct 2003 16:36:18 -0000
-@@ -214,6 +214,7 @@
-
- #check java docu, it is only a first and simple check
- # improvement required
-+if ($ENV["SOLAR_JAVA"] ne "") {
- print "check java docu: ";
- if (-d "$StartDir/docs/java/ref") {
- if (! -e "$StartDir/docs/java/ref/index.html") {
-@@ -246,6 +247,7 @@
- $return++;
- }
- print "\n";
-+}
-
- #check examples, it is only a first and simple check
- # improvement required
+++ /dev/null
---- officecfg/util/makefile.pmk.orig 2003-09-23 10:17:12.000000000 -0700
-+++ officecfg/util/makefile.pmk 2003-09-23 10:23:40.000000000 -0700
-@@ -67,34 +67,93 @@
- $(MISC)$/registry$/schema$/%.xcs : %.xcs
- @+echo -------------+ validating and stripping schema files
- -$(MKDIR) -p $(@:d)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp
- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
-+.ELSE
-+# xsltproc already validates against the dtd. For additional validation,
-+# org.openoffice.configuration.Inspector should be replaced and the
-+# replacement should be invoked here.
-+ $(XSLTPROC) -o $(@:d)$(<:b).val \
-+ --stringparam file $(<:d)$(<:b) \
-+ --stringparam pathSeparator $/ \
-+ $(PRJ)$/util$/schema_val.xsl $<
-+ $(XSLTPROC) -o $(@:d)$(<:b).san \
-+ --stringparam file $(<:d)$(<:b) \
-+ --stringparam pathSeparator $/ \
-+ $(PRJ)$/util$/sanity.xsl $<
-+ $(XSLTPROC) -o $(@:d)$(<:b).tmp \
-+ $(PRJ)$/util$/schema_trim.xsl $<
-+# xsltproc already seems to pretty-print the xml, so
-+# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
-+ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
-+.ENDIF
- +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
- +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
-
- $(MISC)$/registry$/res$/{$(alliso)}$/%.properties :| %.xcs
- @+echo -------------+ creating locale dependent resource bundles
- -$(MKDIR) -p $(@:d)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
-+.ELSE
-+ $(XSLTPROC) -o $(@:d)$(<:b).properties \
-+ --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
-+ $(PRJ)$/util$/resource.xsl $<
-+.ENDIF
-
- # --- XCU ---
-
- $(MISC)$/registry$/data$/%.xcu : %.xcu
- @+echo -------------+ validating and creating a locale independent file
- -$(MKDIR) -p $(@:d)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
-+.ELSE
-+# xsltproc already validates against the dtd. For additional validation,
-+# org.openoffice.configuration.Inspector should be replaced and the
-+# replacement should be invoked here.
-+ $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/dataval2.xsl
-+ $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
-+ $(XSLTPROC) -o $(@:d)$(<:b).val \
-+ --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
-+ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-+ $(PRJ)$/util$/dataval2.xsl $<
-+ $(XSLTPROC) -o $(@:d)$(<:b).tmp \
-+ --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
-+ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-+ $(PRJ)$/util$/alllang2.xsl $<
-+# xsltproc already seems to pretty-print the xml, so
-+# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
-+ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
-+ +$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV)
-+ +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
-+.ENDIF
- +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
- +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
-
- $(MISC)$/registry$/res$/{$(alliso)}$/%.xcu :| %.xcu
- @+echo -------------+ creating locale dependent entries
- -$(MKDIR) -p $(@:d)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}
- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
-+.ELSE
-+ $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
-+ $(XSLTPROC) -o $(@:d)$(<:b).tmp \
-+ --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
-+ --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-+ --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} \
-+ $(PRJ)$/util$/alllang2.xsl $<
-+# xsltproc already seems to pretty-print the xml, so
-+# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
-+ cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
-+ +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
-+.ENDIF
- +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
+++ /dev/null
-Index: svx/source/svdraw/svdoole2.cxx
-===================================================================
---- svx/source/svdraw/svdoole2.cxx.orig 2003-06-06 12:44:20.000000000 +0200
-+++ svx/source/svdraw/svdoole2.cxx 2003-11-09 15:07:54.000000000 +0100
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -377,6 +377,8 @@ void SdrOle2Obj::Connect()
- {
- pInfo->SetDeleted(FALSE);
- }
-+
-+ mpImpl->mbConnected = true;
- }
-
- // In Cache einfuegen
-@@ -412,7 +414,6 @@ void SdrOle2Obj::Connect()
- xBC->addModifyListener( xListener );
- }
-
-- mpImpl->mbConnected = true;
- }
- }
-
-@@ -570,7 +571,13 @@ XubString SdrOle2Obj::GetName() const
-
- void SdrOle2Obj::SetPersistName( const String& rPersistName )
- {
-+ if( mpImpl->mbConnected )
-+ Disconnect();
-+
- mpImpl->aPersistName = rPersistName;
-+
-+ Connect();
-+
- SetChanged();
- }
-
-@@ -1283,7 +1290,11 @@ const SvInPlaceObjectRef& SdrOle2Obj::Ge
- uno::Reference< util::XModifyListener > xListener( pModifyListener );
- xBC->addModifyListener( xListener );
- }
-+
- }
-+
-+ // we are always connected if we loaded it
-+ mpImpl->mbConnected = true;
- }
- }
-
+++ /dev/null
-diff -Nur oo.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java oo/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java
---- oo.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java Mon Jul 14 22:14:32 2003
-+++ oo/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java Mon Jul 14 22:14:57 2003
-@@ -200,7 +200,7 @@
- index--;
- }
-
-- public org.openide.WizardDescriptor$Panel current() {
-+ public org.openide.WizardDescriptor.Panel current() {
- return panels[index];
- }
-
-diff -Nur oo.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java oo/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java
---- oo.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java Tue Sep 3 18:25:06 2002
-+++ oo/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java Mon Jul 14 22:15:08 2003
-@@ -207,7 +207,7 @@
- index--;
- }
-
-- public org.openide.WizardDescriptor$Panel current()
-+ public org.openide.WizardDescriptor.Panel current()
- {
- return panels[index];
- }
-diff -Nur oo.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java oo/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java
---- oo.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java Wed Mar 26 14:40:24 2003
-+++ oo/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java Mon Jul 14 22:15:20 2003
-@@ -214,7 +214,7 @@
- index--;
- }
-
-- public org.openide.WizardDescriptor$Panel current() {
-+ public org.openide.WizardDescriptor.Panel current() {
- return panels[index];
- }
-
+++ /dev/null
-diff -urN padmin-old/source/makefile.mk padmin/source/makefile.mk
---- padmin-old/source/makefile.mk 2003-10-13 02:02:59.000000000 +0200
-+++ padmin/source/makefile.mk 2003-10-13 02:25:38.000000000 +0200
-@@ -70,6 +70,10 @@
-
- .INCLUDE: settings.mk
-
-+.IF "$(FONTCONFIG_FONTS)" != ""
-+CFLAGS+=-DFONTCONFIG_FONTS
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SRCFILES=padialog.src rtsetup.src
-@@ -95,11 +99,13 @@
- $(SLO)$/newppdlg.obj \
- $(SLO)$/prtsetup.obj \
- $(SLO)$/prgsbar.obj \
-- $(SLO)$/fontentry.obj \
- $(SLO)$/helper.obj \
- $(SLO)$/adddlg.obj \
- $(SLO)$/titlectrl.obj
-
-+.IF "$(FONTCONFIG_FONTS)" == ""
-+SLOFILES+= $(SLO)$/fontentry.obj
-+.ENDIF
-
- OBJFILES=\
- $(OBJ)/pamain.obj
-diff -urN padmin-old/source/padialog.cxx padmin/source/padialog.cxx
---- padmin-old/source/padialog.cxx 2003-10-13 02:02:59.000000000 +0200
-+++ padmin/source/padialog.cxx 2003-10-13 02:08:07.000000000 +0200
-@@ -89,12 +89,19 @@
- #ifndef _TOOLS_COLOR_HXX
- #include <tools/color.hxx>
- #endif
-+#ifndef _URLOBJ_HXX
-+#include <tools/urlobj.hxx>
-+#endif
- #ifndef _PAD_PADIALOG_HRC_
- #include <padialog.hrc>
- #endif
-+
-+#ifndef FONTCONFIG_FONTS
- #ifndef _PAD_FONTENTRY_HXX_
- #include <fontentry.hxx>
- #endif
-+#endif
-+
- #ifndef _PAD_HELPER_HXX_
- #include <helper.hxx>
- #endif
-@@ -135,7 +142,9 @@
- m_aStdPB( this, PaResId( RID_PA_BTN_STD ) ),
- m_aRemPB( this, PaResId( RID_PA_BTN_DEL ) ),
- m_aPrintersFL( this, PaResId( RID_PA_FL_PRINTERS ) ),
-+#ifndef FONTCONFIG_FONTS
- m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
-+#endif
- m_aConfPB( this, PaResId( RID_PA_BTN_CONF ) ),
- m_aRenamePB( this, PaResId( RID_PA_BTN_RENAME ) ),
- m_aTestPagePB( this, PaResId( RID_PA_TESTPAGE ) ),
-@@ -174,13 +183,15 @@
- m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
-- m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
-
-+#ifndef FONTCONFIG_FONTS
-+ m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
- if( ! rFontManager.checkImportPossible() )
- m_aFontsPB.Enable( FALSE );
-+#endif
- }
-
- PADialog::~PADialog()
-@@ -217,11 +228,13 @@
- PrintTestPage();
- else if( pButton == &m_aAddPB )
- AddDevice();
-+#ifndef FONTCONFIG_FONTS
- else if( pButton == &m_aFontsPB )
- {
- FontNameDlg aDialog( this );
- aDialog.Execute();
- }
-+#endif
-
- return 0;
- }
-diff -urN padmin-old/source/padialog.hxx padmin/source/padialog.hxx
---- padmin-old/source/padialog.hxx 2003-10-13 02:02:59.000000000 +0200
-+++ padmin/source/padialog.hxx 2003-10-13 02:08:07.000000000 +0200
-@@ -118,7 +118,9 @@
-
- FixedLine m_aSepButtonFL;
- PushButton m_aAddPB;
-+#ifndef FONTCONFIG_FONTS
- PushButton m_aFontsPB;
-+#endif
- CancelButton m_aCancelButton;
-
- String m_aDefPrt;
+++ /dev/null
-diff -uNr oo.old/config_office/set_soenv.1 oo/config_office/set_soenv.1
---- oo.old/config_office/set_soenv.1 Wed Jul 3 22:44:19 2002
-+++ oo/config_office/set_soenv.1 Wed Jul 3 22:35:35 2002
-@@ -578,7 +579,9 @@
- { AddWarning( "set_soenv", "makefile.rc not found in config_office/. Could not copy to SRC_ROOT." );
- }
- else
--{ `cp -f makefile.rc $SRC_ROOT/makefile.mk`;
-+{
-+ my $tempik;
-+ $tempik=`cp -f makefile.rc $SRC_ROOT/makefile.mk`;
- }
-
- # 2. Java home directory.
+++ /dev/null
-diff -urN ooo-build-1.1.55.org/patches/OOO_1_1_1/apply ooo-build-1.1.55/patches/OOO_1_1_1/apply
---- ooo-build-1.1.55.org/patches/OOO_1_1_1/apply 2004-05-06 14:39:57.902700112 +0200
-+++ ooo-build-1.1.55/patches/OOO_1_1_1/apply 2004-05-06 14:40:43.252805848 +0200
-@@ -23,7 +23,7 @@
- KDEBase : LinuxCommon, KDECommon, NativeWidgets, StartupNotification, ODKFixes
- KDE : KDEBase, KDEOnly
- SuSE : SuSEOnly, LinuxCommon, KDEBase, GlobalDesktopFiles, VBABits
--PLD : PLDOnly, LinuxCommon, KDEBase, OOoCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
-+PLD : PLDOnly, LinuxCommon, GnomeVFS, GnomeCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
- Ark : ArkOnly, LinuxCommon, NativeWidgets, GlobalDesktopFiles, ODKFixes, VBABits, OOoCUPS
- # somewhat odder:
- Win32 : Common, ODKFixes, VBABits, Win32Only
-@@ -318,7 +318,7 @@
- # Disable broken crashdialog bits
- module-buildset-crashrep.diff
-
--[ XimianOnly, RedHatOnly ]
-+[ XimianOnly, RedHatOnly, PLDOnly ]
- # Disable custom staroffice printer admin thing
- module-buildset.diff
-
+++ /dev/null
-diff -urN ooo-build-1.1.54.org/bin/ooo-wrapper.in ooo-build-1.1.54/bin/ooo-wrapper.in
---- ooo-build-1.1.54.org/bin/ooo-wrapper.in 2004-04-30 02:50:19.000000000 +0200
-+++ ooo-build-1.1.54/bin/ooo-wrapper.in 2004-05-04 11:46:33.758758960 +0200
-@@ -57,13 +57,8 @@
-
- my ($UserInstallDir, $SetupConfig);
-
--if ( $VendorName eq "RedHat" ) {
-- # Define user installation directory
-- $UserInstallDir = "$ENV{HOME}/.rhopenoffice$ConfigSuffix";
--} else {
-- # Define user installation directory
-- $UserInstallDir = "$ENV{HOME}/.xopenoffice$ConfigSuffix";
--}
-+# Define user installation directory
-+$UserInstallDir = "$ENV{HOME}/.openoffice";
-
- # Define setup autoresponse file for user installation
- $SetupConfig = "/etc/openoffice/autoresponse$BinSuffix.conf";
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1/ximian-splash.diff ooo-build-1.1.54/patches/OOO_1_1/ximian-splash.diff
---- ooo-build-1.1.54.org/patches/OOO_1_1/ximian-splash.diff 2004-04-30 02:50:23.000000000 +0200
-+++ ooo-build-1.1.54/patches/OOO_1_1/ximian-splash.diff 2004-05-04 11:46:07.203795928 +0200
-@@ -12,10 +12,10 @@
- -#ifdef BUILD_SPECIAL
- -#define OOO_VENDOR "Sun Microsystems Inc."
- +#if 1
--+#define OOO_VENDOR "Novell, Inc."
-++#define OOO_VENDOR "PLD Linux"
- #define OOO_LICENSE "LGPL"
- -#define OOO_INTRO "openintro_sun.bmp"
--+#define OOO_INTRO "openintro_ximian.bmp"
-++#define OOO_INTRO "openintro_pld.bmp"
- #else
- //#define OOO_VENDOR "my company"
- #define OOO_LICENSE "LGPL"
-@@ -24,7 +24,7 @@
- Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
- {
- - File = "openabout.bmp" ;
--+ File = "openabout_ximian.bmp" ;
-++ File = "openabout_pld.bmp" ;
- };
-
- Bitmap RID_DEFAULTINTRO
+++ /dev/null
---- oo_1.1_src/desktop/source/app/makefile.mk.jj 2003-05-22 10:51:49.000000000 +0200
-+++ oo_1.1_src/desktop/source/app/makefile.mk 2003-10-21 18:04:15.000000000 +0200
-@@ -99,10 +99,34 @@ OBJFILES = \
- $(OBJ)$/checkinstall.obj \
- $(OBJ)$/cmdlinehelp.obj
-
-+SLOFILES = \
-+ $(SLO)$/app.obj \
-+ $(SLO)$/copyright_ascii_sun.obj \
-+ $(SLO)$/copyright_ascii_ooo.obj \
-+ $(SLO)$/lockfile.obj \
-+ $(SLO)$/intro.obj \
-+ $(SLO)$/officeipcthread.obj \
-+ $(SLO)$/appinit.obj \
-+ $(SLO)$/cmdlineargs.obj \
-+ $(SLO)$/oinstanceprovider.obj \
-+ $(SLO)$/opluginframefactory.obj \
-+ $(SLO)$/appsys.obj \
-+ $(SLO)$/desktopresid.obj \
-+ $(SLO)$/dispatchwatcher.obj \
-+ $(SLO)$/ssodlg.obj \
-+ $(SLO)$/ssoinit.obj \
-+ $(SLO)$/configinit.obj \
-+ $(SLO)$/javainteractionhandler.obj \
-+ $(SLO)$/testtool.obj \
-+ $(SLO)$/checkinstall.obj \
-+ $(SLO)$/cmdlinehelp.obj
-+
- .IF "$(GUI)" == "UNX"
- .IF "$(OS)" != "MACOSX"
- OBJFILES+= $(OBJ)$/icon_resource_ooo.obj \
- $(OBJ)$/icon_resource_sun.obj
-+SLOFILES+= $(SLO)$/icon_resource_ooo.obj \
-+ $(SLO)$/icon_resource_sun.obj
- .ENDIF
- .ENDIF
-
+++ /dev/null
-Index: vcl/unx/source/gdi/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/makefile.mk,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 makefile.mk
---- vcl/unx/source/gdi/makefile.mk 27 Aug 2002 14:52:35 -0000 1.9
-+++ vcl/unx/source/gdi/makefile.mk 29 May 2003 15:44:36 -0000
-@@ -103,7 +103,8 @@ SLOFILES= \
- CFLAGS+=-D_USE_PRINT_EXTENSION_=1
- SLOFILES+=$(SLO)$/xprintext.obj
- .ELSE
--SLOFILES+=$(SLO)$/salprnpsp.obj
-+CFLAGS+= `pkg-config --cflags libgnomecups-1.0`
-+SLOFILES+=$(SLO)$/salprncups.obj
- .ENDIF
-
- .IF "$(OS)"=="SOLARIS"
-Index: vcl/unx/inc/salprn.h
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/salprn.h,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 salprn.h
---- vcl/unx/inc/salprn.h 13 Nov 2002 20:24:03 -0000 1.9
-+++ vcl/unx/inc/salprn.h 2 Jun 2003 11:56:15 -0000
-@@ -85,8 +85,10 @@ struct SalInfoPrinterData
-
- struct SalPrinterData
- {
-+ ULONG m_nError;
- String m_aFileName;
- String m_aTmpFile;
-+ String m_aJobName;
- String m_aFaxNr;
- bool m_bFax:1;
- bool m_bPdf:1;
-@@ -95,7 +97,8 @@ struct SalPrinterData
- ::psp::PrinterJob m_aPrintJob;
- ::psp::JobData m_aJobData;
- ::psp::PrinterGfx m_aPrinterGfx;
-- ULONG m_nCopies;
-+ ULONG m_nCopies;
-+ bool isPrintToFile() { return m_aFileName.Len() > 0; }
- };
-
- class Timer;
---- /dev/null 2003-01-30 10:24:37.000000000 +0000
-+++ vcl/unx/source/gdi/salprncups.cxx 2003-05-29 16:48:01.000000000 +0100
-@@ -0,0 +1,1396 @@
-+/*************************************************************************
-+ *
-+ * $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): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+/**
-+ this file implements the sal printer interface ( SalPrinter, SalInfoPrinter
-+ and some printer relevant methods of SalInstance and SalGraphicsData )
-+
-+ as aunderlying library the printer features of psprint are used.
-+
-+ The query methods of a SalInfoPrinter are implemented by querying psprint
-+
-+ The job methods of a SalPrinter are implemented by calling psprint
-+ printer job functions.
-+ */
-+
-+#include <salunx.h>
-+#include <unistd.h>
-+#include <sys/wait.h>
-+
-+#ifndef _SV_JOBSET_H
-+#include <jobset.h>
-+#endif
-+#ifndef _SV_SALINST_HXX
-+#include <salinst.hxx>
-+#endif
-+#ifndef _SV_SALPRN_HXX
-+#include <salprn.hxx>
-+#endif
-+#ifndef _SV_SALGDI_HXX
-+#include <salgdi.hxx>
-+#endif
-+#ifndef _SV_PRINT_H
-+#include <print.h>
-+#endif
-+#ifndef _SV_SALPTYPE_HXX
-+#include <salptype.hxx>
-+#endif
-+#ifndef _SV_SALFRAME_HXX
-+#include <salframe.hxx>
-+#endif
-+#ifndef _SV_SALDATA_HXX
-+#include <saldata.hxx>
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+
-+#include <glib.h>
-+
-+#include <psprint/printerinfomanager.hxx>
-+
-+#ifndef _PSPRINT_JOBDATA_HXX_
-+#include <psprint/jobdata.hxx>
-+#endif
-+
-+#include <libgnomecups/gnome-cups-init.h>
-+#include <libgnomecups/gnome-cups-printer.h>
-+
-+static bool cups_debug = false;
-+
-+namespace cups { };
-+
-+using namespace cups;
-+using namespace psp;
-+using namespace rtl;
-+using namespace osl;
-+
-+namespace cups {
-+
-+ class PrinterInfoManagerCups : ::psp::PrinterInfoManager
-+ {
-+ PrinterInfoManagerCups();
-+ void initialize ();
-+
-+ ::psp::JobData m_aGlobalDefaults;
-+ ::rtl::OUString m_aDefaultPrinter;
-+ GList *m_aPrinterList;
-+ ::std::hash_map< ::rtl::OUString, ::psp::JobData, ::rtl::OUStringHash > m_aJobDataCache;
-+
-+ private:
-+ void mergeToJobData ( ::psp::JobData &rJobInfo, const PPDParser *pParser );
-+ void mergeCupsSettings ( ::psp::JobData &rJobInfo );
-+ public:
-+ String m_aGlobalDriverName;
-+ static PrinterInfoManagerCups& getCups();
-+
-+ bool isBuiltinGeneric() { return m_aPrinterList == NULL; };
-+
-+ void listPrinters ( ::std::list< ::rtl::OUString >& rList ) const;
-+ ::psp::JobData getJobInfo ( const ::rtl::OUString& rPrinter );
-+ SalPrinterQueueInfo *getSalPrinterQueueInfo ( const ::rtl::OUString& rPrinter );
-+ bool checkPrintersChanged ();
-+ GnomeCupsPrinter *getGnomePrinter ( const ::rtl::OUString& rPrinter );
-+ GnomeCupsPrinter *getGnomePrinter ( SalPrinterQueueInfo *aQueueInfo )
-+ { return getGnomePrinter ( aQueueInfo->maPrinterName ); }
-+ const ::rtl::OUString& getDefaultPrinter () const
-+ { return m_aDefaultPrinter; }
-+ virtual const PPDParser *getParserForPrinter( ::rtl::OUString rPrinter );
-+ virtual ::std::hash_map< fontID, fontID > *getFontSubstitutesForPrinter( ::rtl::OUString rPrinter );
-+ virtual FILE *getPipeToPrinter( ::rtl::OUString rPrinter );
-+ };
-+
-+ PrinterInfoManagerCups& PrinterInfoManagerCups::getCups()
-+ {
-+ static PrinterInfoManagerCups aManager;
-+ set( &aManager );
-+ return aManager;
-+ }
-+
-+ extern "C" {
-+ static gboolean
-+ gcups_password_cb (const char *prompt,
-+ char **username,
-+ char **password,
-+ GnomeCupsAuthContext *ctxt)
-+ {
-+ fprintf( stderr, "No authentication yet\n" );
-+ return FALSE;
-+ }
-+ }
-+
-+ PrinterInfoManagerCups::PrinterInfoManagerCups()
-+ {
-+ static bool cups_initialized = false;
-+ if (!cups_initialized) {
-+ cups_initialized = true;
-+ gnome_cups_init( gcups_password_cb );
-+ if (g_getenv ("CUPS_DEBUG") &&
-+ atoi (g_getenv ("CUPS_DEBUG")))
-+ cups_debug = true;
-+ }
-+ initialize ();
-+ }
-+
-+ const ::psp::PPDParser *
-+ PrinterInfoManagerCups::getParserForPrinter( ::rtl::OUString rPrinter )
-+ {
-+ return getJobInfo( rPrinter ).m_pParser;
-+ }
-+
-+ ::std::hash_map< fontID, fontID > *
-+ PrinterInfoManagerCups::getFontSubstitutesForPrinter( ::rtl::OUString rPrinter )
-+ { // font mapping tables are a terrible idea.
-+ return NULL;
-+ }
-+
-+ FILE *
-+ PrinterInfoManagerCups::getPipeToPrinter( ::rtl::OUString rPrinter )
-+ { // we always print to a file
-+ return NULL;
-+ }
-+
-+ bool PrinterInfoManagerCups::checkPrintersChanged()
-+ {
-+ bool different = false;
-+ GList *printers;
-+
-+ /* gnome-cups does timeout polling */
-+ printers = gnome_cups_get_printers ();
-+ if (g_list_length (printers) != g_list_length (m_aPrinterList))
-+ different = true;
-+ else {
-+ GList *l1, *l2;
-+ for (l2 = m_aPrinterList, l1 = printers;
-+ l1 && l2; l1 = l1->next, l2 = l2->next) {
-+ if (strcmp ((char *) l1->data, (char *) l2->data)) {
-+ different = true;
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (different)
-+ initialize ();
-+
-+ return different;
-+ }
-+
-+ void PrinterInfoManagerCups::initialize()
-+ {
-+ rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-+ OUString aPrinterPath( getPrinterPath() );
-+ m_aJobDataCache.clear();
-+
-+ // first initialize the global defaults
-+ m_aGlobalDefaults = JobData();
-+ m_aGlobalDriverName = String( RTL_CONSTASCII_USTRINGPARAM( "CUPS" ) );
-+
-+ // g_warning ("We need to parse SGEN43.PS ... - how can we ship that ?");
-+ // need a parser for the PPDContext. generic printer should do.
-+ m_aGlobalDefaults.m_pParser = PPDParser::getParser
-+ ( String( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) );
-+ m_aGlobalDefaults.m_aContext.setParser( m_aGlobalDefaults.m_pParser );
-+
-+ if( ! m_aGlobalDefaults.m_pParser )
-+ {
-+ fprintf( stderr, "Error: no SGENPRT available, shutting down psprint...\n" );
-+ // return;
-+ }
-+
-+ char *prnt;
-+ if (!(prnt = gnome_cups_get_default()))
-+ prnt = g_strdup("GenericPostscript");
-+ m_aDefaultPrinter = OUString( prnt, strlen( prnt ), RTL_TEXTENCODING_UTF8 );
-+ g_free( prnt );
-+
-+ gnome_cups_printer_list_free( m_aPrinterList );
-+ m_aPrinterList = gnome_cups_get_printers();
-+ }
-+
-+ void
-+ PrinterInfoManagerCups::listPrinters( ::std::list< OUString >& rList ) const
-+ {
-+ GList *l;
-+
-+ rList.clear();
-+ if (m_aPrinterList)
-+ {
-+ for (l = m_aPrinterList; l; l = l->next)
-+ rList.push_back( OUString( (char *)l->data,
-+ strlen( (char *) l->data ),
-+ RTL_TEXTENCODING_UTF8 ) );
-+ }
-+ else
-+ {
-+ rList.push_back( ::rtl::OUString::createFromAscii( "GenericPostscript" ) );
-+ }
-+ }
-+
-+ GnomeCupsPrinter *
-+ PrinterInfoManagerCups::getGnomePrinter ( const ::rtl::OUString& rPrinter )
-+ {
-+ if (isBuiltinGeneric())
-+ return NULL;
-+ else
-+ {
-+ OString name = OUStringToOString( rPrinter, RTL_TEXTENCODING_UTF8 );
-+ return gnome_cups_printer_get (name.getStr());
-+ }
-+ }
-+
-+ SalPrinterQueueInfo*
-+ PrinterInfoManagerCups::getSalPrinterQueueInfo ( const ::rtl::OUString& rPrinter )
-+ {
-+ GnomeCupsPrinter *printer = getGnomePrinter( rPrinter );
-+
-+ OString name = OUStringToOString( rPrinter, RTL_TEXTENCODING_UTF8 );
-+ // fprintf (stderr, "Add printer '%s'\n", name.getStr());
-+
-+ SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
-+ pInfo->maPrinterName = OUString (rPrinter);
-+ pInfo->maDriver = m_aGlobalDriverName;
-+ pInfo->maLocation = String
-+ ( printer ? gnome_cups_printer_get_location( printer ) : "", RTL_TEXTENCODING_UTF8);
-+ pInfo->maComment = String
-+ ( printer ? gnome_cups_printer_get_description (printer) : "", RTL_TEXTENCODING_UTF8);
-+ pInfo->mpSysData = NULL;
-+ pInfo->mnJobs = printer ? gnome_cups_printer_get_job_count (printer) : 0;
-+
-+ gnome_cups_printer_unref( printer );
-+
-+ return pInfo;
-+ }
-+
-+
-+ void
-+ PrinterInfoManagerCups::mergeToJobData ( ::psp::JobData &rJobInfo,
-+ const PPDParser *pParser )
-+ {
-+ rJobInfo.m_pParser = pParser;
-+ rJobInfo.m_aContext.setParser( pParser );
-+
-+ // merge the ppd context keys if the printer has the same keys and values
-+ // this is a bit tricky, since it involves mixing two PPDs
-+ // without constraints which might end up badly
-+ // this feature should be use with caution
-+ // it is mainly to select default paper sizes for new printers
-+ for( int nPPDValueModified = 0; nPPDValueModified < m_aGlobalDefaults.m_aContext.countValuesModified(); nPPDValueModified++ )
-+ {
-+ const PPDKey* pDefKey = m_aGlobalDefaults.m_aContext.getModifiedKey( nPPDValueModified );
-+ const PPDValue* pDefValue = m_aGlobalDefaults.m_aContext.getValue( pDefKey );
-+ const PPDKey* pPrinterKey = pDefKey ? rJobInfo.m_pParser->getKey( pDefKey->getKey() ) : NULL;
-+ if( pDefKey && pPrinterKey )
-+ // at least the options exist in both PPDs
-+ {
-+ if( pDefValue )
-+ {
-+ const PPDValue* pPrinterValue = pPrinterKey->getValue( pDefValue->m_aOption );
-+ if( pPrinterValue )
-+ // the printer has a corresponding option for the key
-+ rJobInfo.m_aContext.setValue( pPrinterKey, pPrinterValue );
-+ }
-+ else
-+ rJobInfo.m_aContext.setValue( pPrinterKey, NULL );
-+ }
-+ }
-+ }
-+
-+ void
-+ PrinterInfoManagerCups::mergeCupsSettings( ::psp::JobData &rJobInfo )
-+ {
-+ GnomeCupsPrinter *printer;
-+
-+ printer = getGnomePrinter( rJobInfo.m_aPrinterName );
-+
-+ if( cups_debug ) {
-+ gnome_cups_printer_force_refresh( printer, GNOME_CUPS_PRINTER_REFRESH_OPTIONS );
-+ g_warning ("Forced printer option refresh");
-+ }
-+
-+ // Set the local cups options
-+ if (printer)
-+ {
-+ if (cups_debug)
-+ g_warning ("Refreshing user options ...");
-+
-+ GList *user_options = gnome_cups_printer_get_options (printer);
-+
-+ for (GList *l = user_options; l; l = l->next)
-+ {
-+ GnomeCupsPrinterOptionChoice *opt = (GnomeCupsPrinterOptionChoice *) l->data;
-+
-+ char *value = gnome_cups_printer_get_option_value (printer, opt->value);
-+
-+ if (cups_debug)
-+ g_warning (" '%s' -> '%s'", opt->value, value);
-+
-+ if (!opt->text || !value)
-+ continue;
-+
-+ const PPDKey* pKey;
-+
-+ pKey = rJobInfo.m_pParser->getKey( String::CreateFromAscii( opt->value ) );
-+ if (pKey) {
-+ const PPDValue* pValue;
-+
-+ pValue = pKey->getValue( String( value, RTL_TEXTENCODING_UTF8 ) );
-+
-+ if (pValue)
-+ rJobInfo.m_aContext.setValue( pKey, pValue );
-+
-+ else if (cups_debug)
-+ g_warning ("No value '%s'", value);
-+
-+ } else if (cups_debug)
-+ g_warning ("No key '%s'", opt->value);
-+ }
-+ gnome_cups_printer_option_list_free (user_options);
-+
-+ gnome_cups_printer_unref( printer );
-+ }
-+ else if (cups_debug)
-+ g_warning ("No printer");
-+ }
-+
-+ ::psp::JobData
-+ PrinterInfoManagerCups::getJobInfo( const ::rtl::OUString& rPrinter )
-+ {
-+ ::std::hash_map< OUString, ::psp::JobData, OUStringHash >::const_iterator it = m_aJobDataCache.find( rPrinter );
-+
-+ if (it != m_aJobDataCache.end()) {
-+ ::psp::JobData aJobInfo = it->second;
-+ mergeCupsSettings( aJobInfo );
-+
-+ return aJobInfo;
-+ }
-+
-+ ::psp::JobData aJobInfo = m_aGlobalDefaults;
-+
-+ OString name = OUStringToOString( rPrinter, RTL_TEXTENCODING_UTF8 );
-+
-+ aJobInfo.m_aPrinterName = OUString (rPrinter);
-+
-+ const char *v;
-+ if( cups_debug && (v = g_getenv( "PPD_DO" )) && atoi( v ) )
-+ g_warning ("--- ppd parsing disabled ---");
-+ else
-+ {
-+ GnomeCupsPrinter *printer = NULL;
-+ GnomeCupsPPDFile *ppd_file = NULL;
-+ char *ppd_fname = NULL;
-+ const PPDParser *pParser = NULL;
-+
-+ if ( ( printer = getGnomePrinter( rPrinter ) ) &&
-+ ( ppd_file = gnome_cups_printer_get_ppd_file( printer ) ) &&
-+ ( ppd_fname = gnome_cups_ppd_file_get_name( ppd_file ) ) &&
-+ ( pParser = PPDParser::getParser ( String( ppd_fname, RTL_TEXTENCODING_UTF8 ) ) ) &&
-+ pParser )
-+ {
-+ if (cups_debug)
-+ g_warning ("---- parse ppd ...----");
-+ mergeToJobData (aJobInfo, pParser);
-+ }
-+ else if (cups_debug)
-+ g_warning ("---- failed to parse ppd '%s' ----", ppd_fname);
-+
-+ g_free( ppd_fname );
-+ gnome_cups_ppd_file_release( ppd_file );
-+ gnome_cups_printer_unref( printer );
-+ }
-+
-+ mergeCupsSettings( aJobInfo );
-+
-+
-+ m_aJobDataCache[ rPrinter ] = aJobInfo;
-+
-+ return aJobInfo;
-+ }
-+
-+} /* namespace cups */
-+
-+inline int PtTo10Mu( int nPoints ) { return (int)(((double)nPoints)*35.27777778)+0.5; }
-+
-+inline int TenMuToPt( int nUnits ) { return (int)(((double)nUnits)/35.27777778)+0.5; }
-+
-+static struct
-+{
-+ int width;
-+ int height;
-+ const char* name;
-+ int namelength;
-+ Paper paper;
-+} aPaperTab[] =
-+{
-+ { 29700, 42000, "A3", 2, PAPER_A3 },
-+ { 21000, 29700, "A4", 2, PAPER_A4 },
-+ { 14800, 21000, "A5", 2, PAPER_A5 },
-+ { 25000, 35300, "B4", 2, PAPER_B4 },
-+ { 17600, 25000, "B5", 2, PAPER_B5 },
-+ { 21600, 27900, "Letter", 6, PAPER_LETTER },
-+ { 21600, 35600, "Legal", 5, PAPER_LEGAL },
-+ { 27900, 43100, "Tabloid", 7, PAPER_TABLOID },
-+ { 0, 0, "USER", 4, PAPER_USER }
-+};
-+
-+static Paper getPaperType( const String& rPaperName )
-+{
-+ ByteString aPaper( rPaperName, RTL_TEXTENCODING_ISO_8859_1 );
-+ for( int i = 0; i < sizeof( aPaperTab )/sizeof( aPaperTab[0] ); i++ )
-+ {
-+ if( ! strcmp( aPaper.GetBuffer(), aPaperTab[i].name ) )
-+ return aPaperTab[i].paper;
-+ }
-+ return PAPER_USER;
-+}
-+
-+static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
-+{
-+
-+ pJobSetup->meOrientation = (Orientation)(rData.m_eOrientation == orientation::Landscape ?
-+ ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
-+
-+ // copy page size
-+ String aPaper;
-+ int width, height;
-+
-+ rData.m_aContext.getPageSize( aPaper, width, height );
-+ pJobSetup->mePaperFormat = getPaperType( aPaper );
-+ pJobSetup->mnPaperWidth = 0;
-+ pJobSetup->mnPaperHeight = 0;
-+ if( pJobSetup->mePaperFormat == PAPER_USER )
-+ {
-+ // transform to 100dth mm
-+ width = PtTo10Mu( width );
-+ height = PtTo10Mu( height );
-+
-+ if( rData.m_eOrientation == psp::orientation::Portrait )
-+ {
-+ pJobSetup->mnPaperWidth = width;
-+ pJobSetup->mnPaperHeight = height;
-+ }
-+ else
-+ {
-+ pJobSetup->mnPaperWidth = height;
-+ pJobSetup->mnPaperHeight = width;
-+ }
-+ }
-+
-+ // copy input slot
-+ const PPDKey* pKey;
-+ const PPDValue* pValue;
-+ ::std::list< const PPDValue* > aValues;
-+ ::std::list< const PPDValue* >::iterator it;
-+
-+ pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
-+ pValue = rData.m_aContext.getValue( pKey );
-+ rData.m_aContext.getUnconstrainedValues( pKey, aValues );
-+ pJobSetup->mnPaperBin = 0xffff;
-+ if ( pKey && pValue )
-+ {
-+ for( pJobSetup->mnPaperBin = 0;
-+ pValue != pKey->getValue( pJobSetup->mnPaperBin ) &&
-+ pJobSetup->mnPaperBin < pKey->countValues();
-+ pJobSetup->mnPaperBin++ )
-+ ;
-+ if( pJobSetup->mnPaperBin >= pKey->countValues() || pValue == pKey->getDefaultValue() )
-+ pJobSetup->mnPaperBin = 0xffff;
-+ }
-+ for( it = aValues.begin(); it != aValues.end(); ++it, pJobSetup->mnPaperBin++ )
-+ if( *it == pValue )
-+ break;
-+ if( it == aValues.end() )
-+ pJobSetup->mnPaperBin = 0xffff;
-+
-+ // copy the whole context
-+ if( pJobSetup->mpDriverData )
-+ rtl_freeMemory( pJobSetup->mpDriverData );
-+
-+ int nBytes;
-+ void* pBuffer = NULL;
-+ if( rData.getStreamBuffer( pBuffer, nBytes ) )
-+ {
-+ pJobSetup->mnDriverDataLen = nBytes;
-+ pJobSetup->mpDriverData = (BYTE*)pBuffer;
-+ }
-+ else
-+ {
-+ pJobSetup->mnDriverDataLen = 0;
-+ pJobSetup->mpDriverData = NULL;
-+ }
-+}
-+
-+/*
-+ * SalInstance
-+ */
-+
-+// -----------------------------------------------------------------------
-+
-+SalInfoPrinter* SalInstance::CreateInfoPrinter(
-+ SalPrinterQueueInfo *pQueueInfo,
-+ ImplJobSetup *pJobSetup )
-+{
-+ maInstData.mbPrinterInit = true;
-+
-+ SalInfoPrinter* pPrinter = new SalInfoPrinter;
-+ PrinterInfoManagerCups& rManager( PrinterInfoManagerCups::getCups() );
-+ ::psp::JobData aJobInfo = rManager.getJobInfo( pQueueInfo->maPrinterName );
-+
-+ pPrinter->maPrinterData.m_aJobData = aJobInfo;
-+ pPrinter->maPrinterData.m_aPrinterGfx.Init( pPrinter->maPrinterData.m_aJobData );
-+
-+ if( pJobSetup )
-+ {
-+ if( pJobSetup->mpDriverData )
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData,
-+ pJobSetup->mnDriverDataLen,
-+ aJobInfo );
-+
-+ pJobSetup->mnSystem = JOBSETUP_SYSTEM_UNIX;
-+ pJobSetup->maPrinterName = pQueueInfo->maPrinterName;
-+ pJobSetup->maDriver = rManager.m_aGlobalDriverName;
-+ copyJobDataToJobSetup( pJobSetup, aJobInfo );
-+ }
-+
-+ return pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
-+{
-+ delete pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalPrinter* SalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
-+{
-+ maInstData.mbPrinterInit = true;
-+ // create and initialize SalPrinter
-+ SalPrinter* pPrinter = new SalPrinter;
-+ pPrinter->maPrinterData.m_aJobData = pInfoPrinter->maPrinterData.m_aJobData;
-+
-+ return pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::DestroyPrinter( SalPrinter* pPrinter )
-+{
-+ delete pPrinter;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
-+{
-+ maInstData.mbPrinterInit = true;
-+ PrinterInfoManagerCups& rManager( PrinterInfoManagerCups::getCups() );
-+ ::std::list< OUString > aPrinters;
-+ rManager.listPrinters( aPrinters );
-+
-+ for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) {
-+ SalPrinterQueueInfo *pInfo = rManager.getSalPrinterQueueInfo( *it );
-+ GetPrinterQueueState( pInfo );
-+ pList->Add( pInfo );
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
-+{
-+ delete pInfo;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
-+{
-+ if (!pInfo)
-+ return;
-+
-+ GnomeCupsPrinter *printer;
-+ printer = PrinterInfoManagerCups::getCups().getGnomePrinter( pInfo );
-+ if (!printer)
-+ {
-+ pInfo->mnStatus = QUEUE_STATUS_READY;
-+ return;
-+ }
-+
-+ switch (gnome_cups_printer_get_state (printer)) {
-+ case IPP_PRINTER_IDLE:
-+ pInfo->mnStatus = QUEUE_STATUS_READY;
-+ break;
-+ case IPP_PRINTER_PROCESSING:
-+ pInfo->mnStatus = QUEUE_STATUS_PROCESSING;
-+ break;
-+ case IPP_PRINTER_STOPPED:
-+ default:
-+ pInfo->mnStatus = QUEUE_STATUS_ERROR;
-+
-+ GList *l, *reasons = gnome_cups_printer_get_state_reasons (printer);
-+ if (!reasons || !reasons->data)
-+ break;
-+
-+ pInfo->mnStatus = 0;
-+ for (l = reasons; l; l = l->next) {
-+ GnomeCupsPrinterReason *reason = (GnomeCupsPrinterReason *) reasons->data;
-+
-+#define MAP_STATUS(str,en) \
-+ if (!strcmp (reason->keyword, (str))) \
-+ pInfo->mnStatus |= QUEUE_STATUS_##en;
-+
-+ /* cf. RFC 2911.txt 4.4.12 */
-+ MAP_STATUS ("stopping", PENDING_DELETION);
-+ MAP_STATUS ("timed-out", ERROR);
-+ MAP_STATUS ("media-empty", PAPER_PROBLEM);
-+ MAP_STATUS ("connecting-to-device", IO_ACTIVE);
-+ MAP_STATUS ("output-tray-area-full", OUTPUT_BIN_FULL);
-+ MAP_STATUS ("marker-supply-low", TONER_LOW);
-+ MAP_STATUS ("marker-supply-empty", NO_TONER);
-+ MAP_STATUS ("developer-low", TONER_LOW);
-+ MAP_STATUS ("developer-empty", NO_TONER);
-+ MAP_STATUS ("marker-waste-full", USER_INTERVENTION);
-+ MAP_STATUS ("door-open", DOOR_OPEN);
-+ MAP_STATUS ("cover-open", DOOR_OPEN);
-+ MAP_STATUS ("interlock-open", DOOR_OPEN);
-+ MAP_STATUS ("input-tray-missing", DOOR_OPEN);
-+ MAP_STATUS ("output-tray-missing", DOOR_OPEN);
-+ MAP_STATUS ("none", ERROR); // ?
-+ MAP_STATUS ("other", ERROR);
-+ MAP_STATUS ("paused", PAUSED);
-+ MAP_STATUS ("moving-to-paused", PAUSED);
-+ MAP_STATUS ("shutdown", OFFLINE);
-+ MAP_STATUS ("media-jam", PAPER_JAM);
-+ MAP_STATUS ("media-needed", PAPER_OUT);
-+ MAP_STATUS ("media-low", READY); // PAPER_PROBLEM
-+ MAP_STATUS ("output-tray-area-almost-full", READY); // OUTPUT_BIN_FULL
-+ MAP_STATUS ("marker-waste-almost-full", READY); // USER_INTERVENTION
-+#undef MAP_STATUS
-+ }
-+
-+ if ( !pInfo->mnStatus )
-+ pInfo->mnStatus = QUEUE_STATUS_ERROR;
-+
-+ gnome_cups_printer_free_reasons( reasons );
-+ break;
-+ }
-+ gnome_cups_printer_unref( printer );
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+String SalInstance::GetDefaultPrinter()
-+{
-+ maInstData.mbPrinterInit = true;
-+ PrinterInfoManagerCups& rManager( PrinterInfoManagerCups::getCups() );
-+ return rManager.getDefaultPrinter();
-+}
-+
-+// =======================================================================
-+
-+SalInfoPrinter::SalInfoPrinter()
-+{
-+ maPrinterData.m_pGraphics = NULL;
-+ m_bPapersInit = false;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalInfoPrinter::~SalInfoPrinter()
-+{
-+ if( maPrinterData.m_pGraphics )
-+ {
-+ delete maPrinterData.m_pGraphics;
-+ maPrinterData.m_pGraphics = NULL;
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+
-+void SalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData )
-+{
-+ m_aPaperFormats.clear();
-+ m_bPapersInit = true;
-+
-+ if( maPrinterData.m_aJobData.m_pParser )
-+ {
-+ const PPDKey* pKey = maPrinterData.m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
-+ if( pKey )
-+ {
-+ int nValues = pKey->countValues();
-+ for( int i = 0; i < nValues; i++ )
-+ {
-+ const PPDValue* pValue = pKey->getValue( i );
-+ vcl::PaperInfo aInfo;
-+ aInfo.m_aPaperName = pValue->m_aOptionTranslation;
-+ if( ! aInfo.m_aPaperName.Len() )
-+ aInfo.m_aPaperName = pValue->m_aOption;
-+ int nWidth = 0, nHeight = 0;
-+ maPrinterData.m_aJobData.m_pParser->getPaperDimension( pValue->m_aOption, nWidth, nHeight );
-+ aInfo.m_nPaperWidth = (unsigned long)((PtTo10Mu( nWidth )+50)/100);
-+ aInfo.m_nPaperHeight = (unsigned long)((PtTo10Mu( nHeight )+50)/100);
-+ m_aPaperFormats.push_back( aInfo );
-+ }
-+ }
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+int SalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData )
-+{
-+ return 900;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalGraphics* SalInfoPrinter::GetGraphics()
-+{
-+ // return a valid pointer only once
-+ // the reasoning behind this is that we could have different
-+ // SalGraphics that can run in multiple threads
-+ // (future plans)
-+ SalGraphics* pRet = NULL;
-+ if( ! maPrinterData.m_pGraphics )
-+ {
-+ maPrinterData.m_pGraphics = new SalGraphics;
-+ maPrinterData.m_pGraphics->maGraphicsData.m_pJobData = &maPrinterData.m_aJobData;
-+ maPrinterData.m_pGraphics->maGraphicsData.m_pPrinterGfx = &maPrinterData.m_aPrinterGfx;
-+ maPrinterData.m_pGraphics->maGraphicsData.bPrinter_ = TRUE;
-+ pRet = maPrinterData.m_pGraphics;
-+ }
-+ return pRet;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics )
-+{
-+ if( pGraphics == maPrinterData.m_pGraphics )
-+ {
-+ delete pGraphics;
-+ maPrinterData.m_pGraphics = NULL;
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+#include <stdio.h>
-+
-+BOOL SalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
-+{
-+ if( ! pFrame || ! pJobSetup )
-+ return FALSE;
-+
-+ OString str = OUStringToOString (maPrinterData.m_aJobData.m_aPrinterName, RTL_TEXTENCODING_UTF8);
-+ const char *argv[] = { "gnome-cups-manager", "--properties", NULL, NULL };
-+ argv [2] = str.getStr ();
-+ BOOL success;
-+
-+ if (cups_debug)
-+ fprintf (stderr, "Setup ... [ properties on '%s' ]\n", str.getStr ());
-+
-+ success = g_spawn_async (NULL, (gchar **)argv,
-+ NULL, G_SPAWN_SEARCH_PATH,
-+ NULL, NULL, NULL, NULL);
-+
-+ return success;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+// This function gets the driver data and puts it into pJobSetup
-+// If pJobSetup->mpDriverData is NOT NULL, then the independend
-+// data should be merged into the driver data
-+// If pJobSetup->mpDriverData IS NULL, then the driver defaults
-+// should be merged into the independent data
-+BOOL SalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
-+{
-+ if (cups_debug)
-+ fprintf (stderr, "--- re-fetch data from cupsd ---\n");
-+ if( pJobSetup->mpDriverData )
-+ return SetData( ~0, pJobSetup );
-+
-+ copyJobDataToJobSetup( pJobSetup, maPrinterData.m_aJobData );
-+ return TRUE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+// This function merges the independ driver data
-+// and sets the new independ data in pJobSetup
-+// Only the data must be changed, where the bit
-+// in nGetDataFlags is set
-+BOOL SalInfoPrinter::SetData(
-+ ULONG nSetDataFlags,
-+ ImplJobSetup* pJobSetup )
-+{
-+ JobData aData;
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+ if( aData.m_pParser )
-+ {
-+ const PPDKey* pKey;
-+ const PPDValue* pValue;
-+
-+ // merge papersize if necessary
-+ if( nSetDataFlags & SAL_JOBSET_PAPERSIZE )
-+ {
-+ int nWidth, nHeight;
-+ if( pJobSetup->meOrientation == ORIENTATION_PORTRAIT )
-+ {
-+ nWidth = pJobSetup->mnPaperWidth;
-+ nHeight = pJobSetup->mnPaperHeight;
-+ }
-+ else
-+ {
-+ nWidth = pJobSetup->mnPaperHeight;
-+ nHeight = pJobSetup->mnPaperWidth;
-+ }
-+ String aPaper;
-+ if( pJobSetup->mePaperFormat == PAPER_USER )
-+ aPaper = aData.m_pParser->matchPaper(
-+ TenMuToPt( pJobSetup->mnPaperWidth ),
-+ TenMuToPt( pJobSetup->mnPaperHeight ) );
-+ else
-+ aPaper = String( ByteString( aPaperTab[ pJobSetup->mePaperFormat ].name ), RTL_TEXTENCODING_ISO_8859_1 );
-+ pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
-+ pValue = pKey ? pKey->getValue( aPaper ) : NULL;
-+ if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
-+ return FALSE;
-+ }
-+
-+ // merge paperbin if necessary
-+ if( nSetDataFlags & SAL_JOBSET_PAPERBIN )
-+ {
-+ pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
-+ if( pKey )
-+ {
-+ int nPaperBin = pJobSetup->mnPaperBin;
-+ if( nPaperBin == 0xffff )
-+ pValue = pKey->getDefaultValue();
-+ else
-+ pValue = pKey->getValue( pJobSetup->mnPaperBin );
-+
-+ // may fail due to constraints;
-+ // real paper bin is copied back to jobsetup in that case
-+ aData.m_aContext.setValue( pKey, pValue );
-+ }
-+ // if printer has no InputSlot key simply ignore this setting
-+ // (e.g. SGENPRT has no InputSlot)
-+ }
-+
-+ // merge orientation if necessary
-+ if( nSetDataFlags & SAL_JOBSET_ORIENTATION )
-+ aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
-+
-+ maPrinterData.m_aJobData = aData;
-+ copyJobDataToJobSetup( pJobSetup, aData );
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SalInfoPrinter::GetPageInfo(
-+ const ImplJobSetup* pJobSetup,
-+ long& rOutWidth, long& rOutHeight,
-+ long& rPageOffX, long& rPageOffY,
-+ long& rPageWidth, long& rPageHeight )
-+{
-+ if( ! pJobSetup )
-+ return;
-+
-+ JobData aData;
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+ // get the selected page size
-+ if( aData.m_pParser )
-+ {
-+ String aPaper;
-+ int width, height;
-+ int left = 0, top = 0, right = 0, bottom = 0;
-+ int nDPI = aData.m_aContext.getRenderResolution();
-+
-+
-+ if( aData.m_eOrientation == psp::orientation::Portrait )
-+ {
-+ aData.m_aContext.getPageSize( aPaper, width, height );
-+ aData.m_pParser->getMargins( aPaper, left, right, top, bottom );
-+ }
-+ else
-+ {
-+ aData.m_aContext.getPageSize( aPaper, height, width );
-+ aData.m_pParser->getMargins( aPaper, bottom, top, left, right );
-+ }
-+ rPageWidth = width * nDPI / 72;
-+ rPageHeight = height * nDPI / 72;
-+ rPageOffX = left * nDPI / 72;
-+ rPageOffY = top * nDPI / 72;
-+ rOutWidth = ( width - left - right ) * nDPI / 72;
-+ rOutHeight = ( height - top - bottom ) * nDPI / 72;
-+
-+ if( cups_debug )
-+ g_warning ("SalInfoPrinter:: GetPageInfo ... margins: %ld %ld %ld %ld",
-+ rPageOffX, rPageOffY, rPageWidth - rOutWidth, rPageHeight - rOutHeight);
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG SalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
-+{
-+ if( ! pJobSetup )
-+ return 0;
-+
-+ JobData aData;
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+ const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-+
-+ return pKey ? pKey->countValues() : 0;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+String SalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG nPaperBin )
-+{
-+ JobData aData;
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
-+
-+ String aRet;
-+ if( aData.m_pParser )
-+ {
-+ const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-+ if( nPaperBin == 0xffff || !pKey )
-+ aRet = aData.m_pParser->getDefaultInputSlot();
-+ else
-+ {
-+ const PPDValue* pValue = pKey->getValue( nPaperBin );
-+ if( pValue )
-+ aRet = pValue->m_aOptionTranslation.Len() ? pValue->m_aOptionTranslation : pValue->m_aOption;
-+ }
-+ }
-+
-+ return aRet;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG SalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT nType )
-+{
-+ /* FIXME: surely we can do better here */
-+ switch( nType )
-+ {
-+ case PRINTER_CAPABILITIES_SUPPORTDIALOG:
-+ return 1;
-+ case PRINTER_CAPABILITIES_COPIES:
-+ return 0xffff;
-+ case PRINTER_CAPABILITIES_COLLATECOPIES:
-+ return 0;
-+ case PRINTER_CAPABILITIES_SETORIENTATION:
-+ return 1;
-+ case PRINTER_CAPABILITIES_SETPAPERBIN:
-+ return 1;
-+ case PRINTER_CAPABILITIES_SETPAPERSIZE:
-+ return 1;
-+ case PRINTER_CAPABILITIES_SETPAPER:
-+ return 0;
-+ case PRINTER_CAPABILITIES_FAX:
-+ return 0;
-+ default: break;
-+ };
-+ return 0;
-+}
-+
-+// =======================================================================
-+
-+/*
-+ * SalPrinter
-+ */
-+
-+SalPrinter::SalPrinter()
-+{
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalPrinter::~SalPrinter()
-+{
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+static inline String getTmpName()
-+{
-+ int fd;
-+ String ret;
-+ char *tmp_name;
-+
-+ tmp_name = g_strdup_printf( "%s/ooo-ps-XXXXXX",
-+ g_get_tmp_dir() );
-+
-+ if ((fd = g_mkstemp (tmp_name)))
-+ close (fd);
-+ else
-+ {
-+ g_warning ("Failed to create tmpfile '%s'", tmp_name);
-+ return ret;
-+ }
-+
-+ ret = String( ByteString( tmp_name ), RTL_TEXTENCODING_UTF8 );
-+
-+ g_free (tmp_name);
-+
-+ return ret;
-+}
-+
-+BOOL SalPrinter::StartJob(
-+ const XubString* pFileName,
-+ const XubString& rJobName,
-+ const XubString& rAppName,
-+ ULONG nCopies, BOOL bCollate,
-+ ImplJobSetup* pJobSetup )
-+{
-+ int nMode = 0;
-+ vcl_sal::PrinterUpdate::jobStarted();
-+
-+ maPrinterData.m_bFax = false;
-+ maPrinterData.m_bPdf = false;
-+ maPrinterData.m_aFileName = pFileName ? *pFileName : String();
-+ maPrinterData.m_aJobName = rJobName;
-+ maPrinterData.m_aTmpFile = String();
-+ maPrinterData.m_nCopies = nCopies;
-+
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen,
-+ maPrinterData.m_aJobData );
-+ if( maPrinterData.m_nCopies > 1 )
-+ // in case user did not do anything (m_nCopies=1)
-+ // take the default from jobsetup
-+ maPrinterData.m_aJobData.m_nCopies = maPrinterData.m_nCopies;
-+
-+ maPrinterData.m_aTmpFile = getTmpName();
-+ if (!maPrinterData.m_aTmpFile.Len())
-+ return FALSE;
-+
-+ String printTo;
-+ if (maPrinterData.isPrintToFile ())
-+ {
-+ ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
-+ it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "Filter#" ) );
-+ nMode = S_IRUSR | S_IWUSR;
-+ if( it != pJobSetup->maValueMap.end() )
-+ {
-+ OUString aFilter = it->second;
-+ maPrinterData.m_bPdf = !aFilter.compareToAscii( "PDF" );
-+ }
-+
-+ if (maPrinterData.m_bPdf)
-+ printTo = maPrinterData.m_aTmpFile;
-+ else
-+ printTo = maPrinterData.m_aFileName;
-+ }
-+ else
-+ printTo = maPrinterData.m_aTmpFile;
-+
-+ maPrinterData.m_aPrinterGfx.Init( maPrinterData.m_aJobData );
-+
-+ // FIXME: race
-+ if (PrinterInfoManagerCups::getCups().isBuiltinGeneric() &&
-+ !maPrinterData.m_aFileName.Len())
-+ {
-+#ifdef SAL_PRINTER_ERROR_NO_PRINTER
-+ maPrinterData.m_nError = SAL_PRINTER_ERROR_NO_PRINTER;
-+ return FALSE;
-+#else
-+ g_warning ("Can't print with generic printer");
-+#endif
-+ }
-+
-+ return maPrinterData.m_aPrintJob.StartJob
-+ ( printTo, nMode, rJobName, rAppName, maPrinterData.m_aJobData,
-+ &maPrinterData.m_aPrinterGfx ) ? TRUE : FALSE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+BOOL SalPrinter::EndJob()
-+{
-+ BOOL bSuccess = maPrinterData.m_aPrintJob.EndJob();
-+ BOOL bUnlink = FALSE;
-+ OString aTmpName = OUStringToOString
-+ ( maPrinterData.m_aTmpFile, RTL_TEXTENCODING_UTF8 );
-+
-+ if( bSuccess )
-+ {
-+ if (maPrinterData.isPrintToFile ())
-+ {
-+ if (maPrinterData.m_bPdf)
-+ {
-+ if (cups_debug)
-+ g_warning ("Print to PDF...");
-+ String aCommandLine = String( RTL_CONSTASCII_USTRINGPARAM(
-+ "/usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile=\"(OUTFILE)\" (INFILE)" ) );
-+
-+ if (g_getenv ("SAL_PDF_CONVERT_CMD"))
-+ aCommandLine.AssignAscii (g_getenv ("SAL_PDF_CONVERT_CMD"));
-+
-+#define REPLACE(a,b) \
-+ while( aCommandLine.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( a ) ), b ) != STRING_NOTFOUND );
-+
-+ REPLACE ("(OUTFILE)", maPrinterData.m_aFileName);
-+ REPLACE ("(INFILE)", maPrinterData.m_aTmpFile);
-+
-+ OString aSystemCmd = OUStringToOString ( aCommandLine, RTL_TEXTENCODING_UTF8 );
-+ gint exit_status = 0;
-+ if (!g_spawn_command_line_sync (aSystemCmd.getStr (), NULL, NULL, &exit_status, NULL))
-+ bSuccess = FALSE;
-+ else
-+ bSuccess = !exit_status;
-+ }
-+ else if (cups_debug)
-+ g_warning ("Print to PS file...");
-+ }
-+ else
-+ {
-+ OString aJobTitle = OUStringToOString
-+ ( maPrinterData.m_aJobName, RTL_TEXTENCODING_UTF8 );
-+
-+ if (cups_debug)
-+ g_warning( "Printing file '%s' name '%s' to '%s'",
-+ (const sal_Char *)aTmpName,
-+ (const sal_Char *)OUStringToOString
-+ ( maPrinterData.m_aJobName, RTL_TEXTENCODING_UTF8 ),
-+ (const sal_Char *)OUStringToOString
-+ ( maPrinterData.m_aJobData.m_aPrinterName, RTL_TEXTENCODING_UTF8 ) );
-+
-+ GError *error = NULL;
-+ GList *print_options = NULL;
-+ GnomeCupsPrinter *printer;
-+
-+ printer = PrinterInfoManagerCups::getCups().getGnomePrinter
-+ ( maPrinterData.m_aJobData.m_aPrinterName );
-+
-+#ifdef USE_CUPS_OPTIONS
-+ gnome_cups_printer_force_refresh
-+ ( printer, GNOME_CUPS_PRINTER_REFRESH_OPTIONS );
-+ print_options = gnome_cups_printer_get_options( printer );
-+#endif
-+ bSuccess = gnome_cups_printer_print_file
-+ ( printer, (const sal_Char *) aTmpName,
-+ (const sal_Char *) aJobTitle, print_options, &error) != 0;
-+
-+ if (!bSuccess) {
-+ if (cups_debug)
-+ g_warning ("Error printing '%s' ... (0x%x)",
-+ aTmpName.getStr(), error ? error->code : -1);
-+ // We can map the IPP status type in error->code but
-+ // since we can only map it to 2 errors, why bother
-+ maPrinterData.m_nError = PRINTER_GENERALERROR;
-+ }
-+
-+#ifdef USE_CUPS_OPTIONS
-+ gnome_cups_printer_option_list_free( print_options );
-+#endif
-+
-+ gnome_cups_printer_unref( printer );
-+ }
-+ }
-+ else if (cups_debug)
-+ g_warning ("Internal printing was not a success");
-+
-+ if (maPrinterData.m_aTmpFile.Len())
-+ {
-+ if (cups_debug)
-+ g_warning ("Unlinking tmpfile");
-+ unlink( (const sal_Char *) aTmpName );
-+ }
-+
-+ vcl_sal::PrinterUpdate::jobEnded();
-+
-+ if (cups_debug)
-+ g_warning ("::EndJob returns %d", bSuccess);
-+ return bSuccess;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+BOOL SalPrinter::AbortJob()
-+{
-+ BOOL bAbort = maPrinterData.m_aPrintJob.AbortJob() ? TRUE : FALSE;
-+ vcl_sal::PrinterUpdate::jobEnded();
-+ return bAbort;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SalGraphics* SalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL bNewJobData )
-+{
-+ JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, maPrinterData.m_aJobData );
-+ maPrinterData.m_pGraphics = new SalGraphics();
-+ maPrinterData.m_pGraphics->maGraphicsData.m_pJobData = &maPrinterData.m_aJobData;
-+ maPrinterData.m_pGraphics->maGraphicsData.m_pPrinterGfx = &maPrinterData.m_aPrinterGfx;
-+ maPrinterData.m_pGraphics->maGraphicsData.bPrinter_ = true;
-+ maPrinterData.m_pGraphics->maGraphicsData.m_pPhoneNr = maPrinterData.m_bFax ? &maPrinterData.m_aFaxNr : NULL;
-+ maPrinterData.m_pGraphics->maGraphicsData.m_bSwallowFaxNo = maPrinterData.m_bSwallowFaxNo;
-+ if( maPrinterData.m_nCopies > 1 )
-+ // in case user did not do anything (m_nCopies=1)
-+ // take the default from jobsetup
-+ maPrinterData.m_aJobData.m_nCopies = maPrinterData.m_nCopies;
-+
-+ maPrinterData.m_aPrintJob.StartPage( maPrinterData.m_aJobData, bNewJobData ? sal_True : sal_False );
-+ maPrinterData.m_aPrinterGfx.Init( maPrinterData.m_aPrintJob );
-+
-+ return maPrinterData.m_pGraphics;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+BOOL SalPrinter::EndPage()
-+{
-+ sal_Bool bResult = maPrinterData.m_aPrintJob.EndPage();
-+ maPrinterData.m_aPrinterGfx.Clear();
-+ return bResult ? TRUE : FALSE;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+ULONG SalPrinter::GetErrorCode()
-+{
-+ return maPrinterData.m_nError;
-+}
-+
-+/*
-+ * vcl::PrinterUpdate
-+ */
-+
-+Timer* vcl_sal::PrinterUpdate::pPrinterUpdateTimer = NULL;
-+int vcl_sal::PrinterUpdate::nActiveJobs = 0;
-+
-+void vcl_sal::PrinterUpdate::doUpdate()
-+{
-+ ::cups::PrinterInfoManagerCups& rManager( ::cups::PrinterInfoManagerCups::getCups() );
-+ if( rManager.checkPrintersChanged() )
-+ {
-+ SalFrame* pFrame = GetSalData()->pFirstFrame_;
-+ while( pFrame )
-+ {
-+ pFrame->maFrameData.Call( SALEVENT_PRINTERCHANGED, NULL );
-+ pFrame = pFrame->maFrameData.GetNextFrame();
-+ }
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+IMPL_STATIC_LINK( vcl_sal::PrinterUpdate, UpdateTimerHdl, void*, pDummy )
-+{
-+ if( nActiveJobs < 1 )
-+ {
-+ doUpdate();
-+ delete pPrinterUpdateTimer;
-+ pPrinterUpdateTimer = NULL;
-+ }
-+ else
-+ pPrinterUpdateTimer->Start();
-+
-+ return 0;
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void vcl_sal::PrinterUpdate::update()
-+{
-+ if( nActiveJobs < 1 )
-+ doUpdate();
-+ else if( ! pPrinterUpdateTimer )
-+ {
-+ pPrinterUpdateTimer = new Timer();
-+ pPrinterUpdateTimer->SetTimeout( 500 );
-+ pPrinterUpdateTimer->SetTimeoutHdl( STATIC_LINK( NULL, vcl_sal::PrinterUpdate, UpdateTimerHdl ) );
-+ pPrinterUpdateTimer->Start();
-+ }
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void vcl_sal::PrinterUpdate::jobEnded()
-+{
-+ nActiveJobs--;
-+ if( nActiveJobs < 1 )
-+ {
-+ if( pPrinterUpdateTimer )
-+ {
-+ pPrinterUpdateTimer->Stop();
-+ delete pPrinterUpdateTimer;
-+ pPrinterUpdateTimer = NULL;
-+ doUpdate();
-+ }
-+ }
-+}
-Index: vcl/util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.46.2.3
-diff -u -p -u -r1.46.2.3 makefile.mk
---- vcl/util/makefile.mk 31 Jul 2003 15:28:43 -0000 1.46.2.3
-+++ vcl/util/makefile.mk 29 Aug 2003 14:34:04 -0000
-@@ -275,6 +275,8 @@ SHL1STDLIBS += -framework Cocoa
-
- .IF "$(GUIBASE)"=="unx"
-
-+SHL1STDLIBS += `pkg-config --libs libgnomecups-1.0`
-+
- .IF "$(WITH_LIBSN)"=="YES"
- SHL1STDLIBS+=$(LIBSN_LIBS)
- .ENDIF
+++ /dev/null
-Index: svtools/source/dialogs/printdlg.cxx
-===================================================================
-RCS file: /cvs/util/svtools/source/dialogs/printdlg.cxx,v
-retrieving revision 1.16
---- svtools/source/dialogs/printdlg.cxx.orig 2004-03-30 19:47:51.000000000 +0000
-+++ svtools/source/dialogs/printdlg.cxx 2004-03-30 19:51:29.000000000 +0000
-@@ -431,6 +431,10 @@
- {
- try
- {
-+ INetURLObject aLocation( maFiPrintFile.GetText(), INET_PROT_FILE );
-+
-+ xFilePicker->setDefaultName( aLocation.GetLastName() );
-+ xFilePicker->setDisplayDirectory ( aLocation.GetPartBeforeLastName() );
- #ifdef UNX
- // add PostScript and PDF
- if( ! Application::IsRemoteServer() )
-@@ -449,6 +453,10 @@
- xFilterMgr->appendFilter( OUString( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) );
- if( bPDF )
- xFilterMgr->appendFilter( OUString( RTL_CONSTASCII_USTRINGPARAM( "Portable Document Format" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "*.pdf" ) ) );
-+
-+ String aFilter = pPrinter->GetJobValue( String::CreateFromAscii( "Filter#" ) );
-+ if (aFilter.Len())
-+ xFilterMgr->setCurrentFilter( aFilter );
- }
- #elif defined WNT
- xFilterMgr->appendFilter( OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) );
-@@ -465,6 +473,12 @@
- Sequence< OUString > aPathSeq( xFilePicker->getFiles() );
- INetURLObject aObj( aPathSeq[0] );
- maFiPrintFile.SetText( aObj.PathToFileName() );
-+#ifdef UNX
-+ Printer* pPrinter = TEMPPRINTER() ? TEMPPRINTER() : mpPrinter;
-+ if ( pPrinter )
-+ pPrinter->SetJobValue( String::CreateFromAscii( "Filter#" ),
-+ xFilterMgr->getCurrentFilter() );
-+#endif
- return true;
- }
- return false;
+++ /dev/null
-Index: sfx2/source/view/prnmon.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/view/prnmon.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 prnmon.cxx
---- sfx2/source/view/prnmon.cxx 4 Apr 2003 17:40:22 -0000 1.8
-+++ sfx2/source/view/prnmon.cxx 7 Aug 2003 14:38:41 -0000
-@@ -384,7 +384,7 @@ IMPL_LINK_INLINE_START( SfxPrintProgress
- {
- if ( pImp->pMonitor )
- pImp->pMonitor->Hide();
-- pImp->pPrinter->AbortJob();
-+ pImp->pPrinter->SetErrorHdl( Link() );
- InfoBox( pImp->GetViewShell()->GetWindow(),
- String( SfxResId(STR_ERROR_PRINT) ) ).Execute();
- if ( pImp->bRestoreFlag && pImp->pViewShell->GetObjectShell()->IsEnableSetModified() != pImp->bOldFlag )
-Index: vcl/source/gdi/impprn.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/impprn.cxx,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 impprn.cxx
---- vcl/source/gdi/impprn.cxx 27 Mar 2003 17:57:57 -0000 1.5
-+++ vcl/source/gdi/impprn.cxx 7 Aug 2003 14:39:09 -0000
-@@ -350,7 +350,8 @@ IMPL_LINK( ImplQPrinter, ImplPrintHdl, T
- {
- maTimer.Stop();
- delete pActPage;
-- EndJob();
-+ if (!EndJob())
-+ mpParent->Error();
- mpParent->ImplEndPrint();
- }
- else
+++ /dev/null
-diff -urN psprint-old/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
---- psprint-old/inc/psprint/fontmanager.hxx 2003-10-12 23:44:57.000000000 +0200
-+++ psprint/inc/psprint/fontmanager.hxx 2003-10-13 02:19:29.000000000 +0200
-@@ -81,6 +81,13 @@
- #define ATOM_FAMILYNAME 2
- #define ATOM_PSNAME 3
-
-+#ifdef FONTCONFIG_FONTS
-+extern "C" {
-+ struct _FcFontSet;
-+ struct _FcPattern;
-+};
-+#endif
-+
- /*
- * some words on metrics: every length returned by PrintFontManager and
- * friends are PostScript afm style, that is they are 1/1000 font height
-@@ -300,7 +307,9 @@
- int m_nDirectory; // atom containing system dependent path
- rtl::OString m_aFontFile; // relative to directory
- rtl::OString m_aMetricFile; // dito
-+#ifndef FONTCONFIG_FONTS
- rtl::OString m_aXLFD; // mainly for administration, contains the XLFD from fonts.dir
-+#endif
-
- /* note: m_aFontFile and Metric file are not atoms
- because they should be fairly unique */
-@@ -314,7 +323,9 @@
- {
- int m_nDirectory; // atom containing system dependent path
- rtl::OString m_aFontFile; // relative to directory
-+#ifndef FONTCONFIG_FONTS
- rtl::OString m_aXLFD; // mainly for administration, contains the XLFD from fonts.dir
-+#endif
- int m_nCollectionEntry; // -1 for regular fonts, 0 to ... for fonts stemming from collections
- unsigned int m_nTypeFlags; // from TrueType file; only known use is for copyright flags
-
-@@ -339,12 +350,16 @@
- std::hash_map< fontID, PrintFont* > m_aFonts;
- std::hash_map< int, family::type > m_aFamilyTypes;
- std::list< rtl::OUString > m_aPrinterDrivers;
-+#ifndef FONTCONFIG_FONTS
- std::list< rtl::OString > m_aFontDirectories;
- std::list< int > m_aPrivateFontDirectories;
- utl::MultiAtomProvider* m_pAtoms;
- // for speeding up findFontFileID
- std::hash_map< rtl::OString, std::set< fontID >, rtl::OStringHash >
-- m_aFontFileToFontID;
-+ m_aFontFileToFontID;
-+#else
-+ utl::MultiAtomProvider* m_pAtoms;
-+#endif
-
- std::hash_map< rtl::OString, int, rtl::OStringHash >
- m_aDirToAtom;
-@@ -363,17 +378,39 @@
- rtl::OString getAfmFile( PrintFont* pFont ) const;
- rtl::OString getFontFile( PrintFont* pFont ) const;
-
-+#ifndef FONTCONFIG_FONTS
- void getFontAttributesFromXLFD( PrintFont* pFont, const ByteString& rXLFD ) const;
-+#endif
-
- bool analyzeFontFile( int nDirID, const rtl::OString& rFileName, bool bReadFile, const std::list< rtl::OString >& rXLFDs, std::list< PrintFont* >& rNewFonts ) const;
- rtl::OUString convertTrueTypeName( void* pNameRecord ) const; // actually a NameRecord* formt font subsetting code
- void analyzeTrueTypeFamilyName( void* pTTFont, std::list< rtl::OUString >& rnames ) const; // actually a TrueTypeFont* from font subsetting code
- bool analyzeTrueTypeFile( PrintFont* pFont ) const;
-+
-+#ifndef FONTCONFIG_FONTS
- // finds the FIRST id for this font file; there may be more
- // for TrueType collections
- fontID findFontFileID( int nDirID, const rtl::OString& rFile ) const;
-+#endif
- fontID findFontBuiltinID( int nPSNameAtom ) const;
-
-+#ifdef FONTCONFIG_FONTS
-+ void getFontAttributesFromFcPattern( PrintFont* pFont, const struct _FcPattern *fc_font ) const;
-+ void addFcSystemFont (struct _FcPattern *fc_pattern);
-+ void addFcSystemFontSet (struct _FcFontSet *fc_set);
-+ int addFontFile( const ::rtl::OString& rFilePath, const struct _FcPattern *fc_font, bool bMergeBuiltin );
-+#endif
-+ void ensureAnalysed( PrintFont* pFont ) const
-+ {
-+ if ( pFont && pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-+ {
-+ if (pFont->m_eType == fonttype::TrueType )
-+ analyzeTrueTypeFile( pFont );
-+ else if (pFont->m_eType == fonttype::Type1 )
-+ pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms );
-+ }
-+ }
-+
- family::type matchFamilyName( const rtl::OUString& rFamily ) const;
-
- PrintFont* getFont( fontID nID ) const
-@@ -382,14 +419,18 @@
- it = m_aFonts.find( nID );
- return it == m_aFonts.end() ? NULL : it->second;
- }
-+#ifndef FONTCONFIG_FONTS
- ByteString getXLFD( PrintFont* pFont ) const;
-+#endif
- void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const;
- void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const;
-
- const rtl::OString& getDirectory( int nAtom ) const;
- int getDirectoryAtom( const rtl::OString& rDirectory, bool bCreate = false );
-
-+#ifndef FONTCONFIG_FONTS
- void getServerDirectories(); // get font server directories on e.g. redhat
-+#endif
-
- PrintFontManager();
- ~PrintFontManager();
-@@ -512,11 +553,13 @@
- void hasVerticalSubstitutions( fontID nFontID, const sal_Unicode* pCharacters,
- int nCharacters, bool* pHasSubst ) const;
-
-+#ifndef FONTCONFIG_FONTS
- // get the XLFD for a font that originated from the X fontpath
- // note: this may not be the original line that was in the fonts.dir
- // returns a string for every font, but only TrueType and Type1
- // fonts originated from the X font path, so check for the font type
- rtl::OUString getFontXLFD( fontID nFontID ) const;
-+#endif
-
- // get a specific fonts metrics
-
-@@ -582,6 +625,7 @@
-
- // font administration functions
-
-+#ifndef FONTCONFIG_FONTS
- // for importFonts to provide the user feedback
- class ImportFontCallback
- {
-@@ -614,6 +658,7 @@
- bool removeFonts( const std::list< fontID >& rFonts );
-
- bool isPrivateFontFile( fontID ) const;
-+#endif
-
- // returns false if there were not any
- bool getAlternativeFamilyNames( fontID nFont, std::list< rtl::OUString >& rNames ) const;
-diff -urN psprint-old/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
---- psprint-old/source/fontmanager/fontmanager.cxx 2003-10-12 23:44:57.000000000 +0200
-+++ psprint/source/fontmanager/fontmanager.cxx 2003-10-13 02:23:30.000000000 +0200
-@@ -140,6 +140,11 @@
-
- #include <adobeenc.tab> // get encoding table for AFM metrics
-
-+#ifdef FONTCONFIG_FONTS
-+#include <stdio.h>
-+#include <fontconfig/fontconfig.h>
-+#endif
-+
- #define PRINTER_METRICDIR "fontmetric"
-
- using namespace utl;
-@@ -159,6 +164,7 @@
- return nRet;
- }
-
-+#ifndef FONTCONFIG_FONTS
- static italic::type parseItalic( const ByteString& rItalic )
- {
- italic::type eItalic = italic::Unknown;
-@@ -170,6 +176,7 @@
- eItalic = italic::Upright;
- return eItalic;
- }
-+#endif
-
- // -------------------------------------------------------------------------
-
-@@ -210,6 +217,7 @@
-
- // -------------------------------------------------------------------------
-
-+#ifndef FONTCONFIG_FONTS
- static width::type parseWidth( const ByteString& rWidth )
- {
- width::type eWidth = width::Unknown;
-@@ -237,6 +245,7 @@
-
- return eWidth;
- }
-+#endif
-
- // -------------------------------------------------------------------------
-
-@@ -920,6 +929,138 @@
- }
-
- // -------------------------------------------------------------------------
-+#ifdef FONTCONFIG_FONTS
-+int PrintFontManager::addFontFile( const OString& rFontPath,
-+ const FcPattern *fc_font,
-+ bool bMergeBuiltin)
-+{
-+ sal_Int32 idx;
-+ ::std::list< PrintFontManager::PrintFont* > aNewFonts;
-+
-+ idx = rFontPath.lastIndexOf ('/');
-+ if (idx < 0)
-+ {
-+ fprintf (stderr, "Invalid path\n");
-+ return;
-+ }
-+ // Split the directory
-+ OString aDir (rFontPath, idx);
-+ // And the filename
-+ OString aFontFile( rFontPath + idx + 1, rFontPath.getLength() - idx - 1);
-+ // And the extension
-+ ByteString aExt( aFontFile.copy( aFontFile.lastIndexOf( '.' )+1 ) );
-+
-+ int nDirID = getDirectoryAtom( aDir, true );
-+
-+ if( m_pFontCache->getFontCacheFile( nDirID, aDir, aFontFile, aNewFonts ) )
-+ {
-+#ifdef DEBUG
-+ fprintf( stderr, "Hit cache for '%s'", (sal_Char *) rFontPath );
-+#endif
-+ /* got it from the cache */ ;
-+ }
-+ else if( aExt.EqualsIgnoreCaseAscii( "pfb" ) || aExt.EqualsIgnoreCaseAscii( "pfa" ) )
-+ {
-+ // check for corresponding afm metric
-+ // first look for an adjacent file
-+
-+ ByteString aName( aFontFile );
-+ aName.Erase( aName.Len()-4 );
-+ aName.Append( ".afm" );
-+
-+ ByteString aFilePath( aDir );
-+ aFilePath.Append( '/' );
-+ aFilePath.Append( aName );
-+
-+ ByteString aAfmFile;
-+ if( access( aFilePath.GetBuffer(), F_OK ) )
-+ {
-+ // try in subdirectory afm instead
-+ aFilePath = aDir;
-+ aFilePath.Append( "/afm/" );
-+ aFilePath.Append( aName );
-+
-+ if( ! access( aFilePath.GetBuffer(), F_OK ) )
-+ {
-+ aAfmFile = "afm/";
-+ aAfmFile += aName;
-+ }
-+ }
-+ else
-+ aAfmFile = aName;
-+
-+ if( aAfmFile.Len() )
-+ {
-+ Type1FontFile* pFont = new Type1FontFile();
-+ pFont->m_nDirectory = nDirID;
-+
-+ pFont->m_aFontFile = aFontFile;
-+ pFont->m_aMetricFile = aAfmFile;
-+
-+ if (fc_font)
-+ getFontAttributesFromFcPattern( pFont, fc_font );
-+ else if( ! pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms ) )
-+ {
-+ delete pFont;
-+ pFont = NULL;
-+ }
-+ if( pFont )
-+ aNewFonts.push_back( pFont );
-+ }
-+ }
-+ else if( aExt.EqualsIgnoreCaseAscii( "afm" ) )
-+ {
-+ ByteString aFilePath( aDir );
-+ aFilePath.Append( '/' );
-+ aFilePath.Append( ByteString( aFontFile ) );
-+ BuiltinFont* pFont = new BuiltinFont();
-+ pFont->m_nDirectory = nDirID;
-+ pFont->m_aMetricFile = aFontFile;
-+ if( pFont->readAfmMetrics( aFilePath, m_pAtoms ) )
-+ aNewFonts.push_back( pFont );
-+ else
-+ delete pFont;
-+ }
-+ else if( aExt.EqualsIgnoreCaseAscii( "ttf" ) )
-+ {
-+ TrueTypeFontFile* pFont = new TrueTypeFontFile();
-+ pFont->m_nDirectory = nDirID;
-+ pFont->m_aFontFile = aFontFile;
-+ pFont->m_nCollectionEntry = -1;
-+
-+ if( fc_font )
-+ getFontAttributesFromFcPattern( pFont, fc_font );
-+ // need to read the font anyway to get aliases
-+ if( ! analyzeTrueTypeFile( pFont ) )
-+ {
-+ delete pFont;
-+ pFont = NULL;
-+ }
-+ else
-+ aNewFonts.push_back( pFont );
-+ }
-+#warning Disabled ttc parsing, do we need to use the 'index' property for 'nCollectionEntry' ?
-+
-+ for( ::std::list< PrintFont* >::iterator it = aNewFonts.begin(); it != aNewFonts.end(); ++it )
-+ {
-+ if (!bMergeBuiltin ||
-+ !findFontBuiltinID( (*it)->m_nPSName ) )
-+ {
-+ fontID aFont = m_nNextFontID++;
-+ m_aFonts[ aFont ] = *it;
-+ }
-+ else
-+ delete (*it);
-+ }
-+}
-+
-+int PrintFontManager::addFontFile( const ::rtl::OString& rFileName, int nFaceNum )
-+{
-+ // Purely for salgdi3 usage ...
-+ return addFontFile( rFileName, NULL, false );
-+}
-+
-+#else
-
- int PrintFontManager::addFontFile( const ::rtl::OString& rFileName, int nFaceNum )
- {
-@@ -1088,6 +1229,7 @@
- }
- return ! rNewFonts.empty();
- }
-+#endif
-
- // -------------------------------------------------------------------------
-
-@@ -1106,6 +1248,7 @@
-
- // -------------------------------------------------------------------------
-
-+#ifndef FONTCONFIG_FONTS
- fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile ) const
- {
- fontID nID = 0;
-@@ -1292,6 +1435,69 @@
-
- return aXLFD;
- }
-+#else /* FONTCONFIG_FONTS */
-+
-+void PrintFontManager::getFontAttributesFromFcPattern( PrintFont* pFont, const FcPattern *fc_font ) const
-+ {
-+ FcChar8 *fc_str;
-+ int fc_int;
-+
-+ if (!FcPatternGetString (fc_font, FC_FAMILY, 0, &fc_str) && fc_str)
-+ pFont->m_nFamilyName =
-+ m_pAtoms->getAtom( ATOM_FAMILYNAME,
-+ String( ByteString((sal_Char *) fc_str ), RTL_TEXTENCODING_UTF8 ),
-+ sal_True );
-+
-+ if (!FcPatternGetInteger (fc_font, FC_WEIGHT, 0, &fc_int))
-+ {
-+ if (fc_int < FC_WEIGHT_LIGHT)
-+ pFont->m_eWeight = weight::UltraLight;
-+ else if (fc_int == FC_WEIGHT_LIGHT)
-+ pFont->m_eWeight = weight::Light;
-+ else if (fc_int < FC_WEIGHT_MEDIUM)
-+ pFont->m_eWeight = weight::SemiLight;
-+ else if (fc_int == FC_WEIGHT_MEDIUM)
-+ pFont->m_eWeight = weight::Normal;
-+ else if (fc_int < FC_WEIGHT_DEMIBOLD)
-+ pFont->m_eWeight = weight::Medium;
-+ else if (fc_int == FC_WEIGHT_DEMIBOLD)
-+ pFont->m_eWeight = weight::SemiBold;
-+ else if (fc_int <= FC_WEIGHT_BOLD)
-+ pFont->m_eWeight = weight::Bold;
-+ else if (fc_int < FC_WEIGHT_BLACK)
-+ pFont->m_eWeight = weight::UltraBold;
-+ else
-+ pFont->m_eWeight = weight::Black;
-+ }
-+
-+ if (!FcPatternGetInteger (fc_font, FC_SLANT, 0, &fc_int))
-+ {
-+ if (fc_int <= FC_SLANT_ROMAN)
-+ pFont->m_eItalic = italic::Upright;
-+ else if (fc_int <= FC_SLANT_ITALIC)
-+ pFont->m_eItalic = italic::Italic;
-+ else if (fc_int <= FC_SLANT_ITALIC)
-+ pFont->m_eItalic = italic::Oblique;
-+ }
-+
-+ /* FIXME: this used to be parsed from XLFD (parseWidth) */
-+ pFont->m_eWidth = width::Normal;
-+
-+ if (!FcPatternGetInteger (fc_font, FC_SLANT, 0, &fc_int))
-+ {
-+ if (fc_int > FC_PROPORTIONAL && (fc_int <= FC_MONO ||
-+ fc_int <= FC_CHARCELL))
-+ pFont->m_ePitch = pitch::Fixed;
-+ else
-+ pFont->m_ePitch = pitch::Variable;
-+ }
-+ else
-+ pFont->m_ePitch = pitch::Variable;
-+
-+#warning Missing encoding fixup !
-+
-+ }
-+#endif
-
- // -------------------------------------------------------------------------
-
-@@ -1552,6 +1758,7 @@
-
- // -------------------------------------------------------------------------
-
-+#ifndef FONTCONFIG_FONTS
- static void normPath( ByteString& rPath )
- {
- char buf[PATH_MAX];
-@@ -1614,6 +1821,37 @@
- #endif
- }
-
-+#else
-+
-+void
-+PrintFontManager::addFcSystemFont (struct _FcPattern *fc_pattern)
-+ {
-+ FcChar8 *fc_str = NULL;
-+ if( FcPatternGetString( fc_pattern, FC_FILE, 0, &fc_str ) || !fc_str)
-+ return;
-+
-+ OString aFileName( (sal_Char *) fc_str );
-+
-+ addFontFile( aFileName, fc_pattern, false );
-+}
-+
-+void
-+PrintFontManager::addFcSystemFontSet( FcFontSet *fc_set )
-+{
-+ int i;
-+ if (!fc_set)
-+ return;
-+
-+ for (i = 0; i < fc_set->nfont; i++)
-+ {
-+ FcPattern *font = fc_set->fonts[i];
-+ if (!font)
-+ continue;
-+ addFcSystemFont( font );
-+ }
-+}
-+#endif
-+
- void PrintFontManager::initialize( void* pInitDisplay )
- {
- long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ];
-@@ -1639,8 +1877,10 @@
- delete (*it).second;
- m_nNextFontID = 1;
- m_aFonts.clear();
-+#ifndef FONTCONFIG_FONTS
- m_aFontDirectories.clear();
- m_aPrivateFontDirectories.clear();
-+#endif
- }
-
- #if OSL_DEBUG_LEVEL > 1
-@@ -1656,6 +1896,7 @@
- aStart = times( &tms );
- #endif
-
-+#ifndef FONTCONFIG_FONTS
- // part one - look for downloadable fonts
- rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- const ::rtl::OUString &rSalPrivatePath = psp::getFontPath();
-@@ -1864,6 +2105,15 @@
- m_pFontCache->markEmptyDir( nDirID );
- }
- }
-+#else /* FONTCONFIG_FONTS */
-+
-+ FcConfig *config = FcInitLoadConfigAndFonts();
-+ if ( !config)
-+ fprintf( stderr, "Can't init fontconfig\n" );
-+
-+ addFcSystemFontSet( FcConfigGetFonts( config, FcSetSystem ) );
-+ addFcSystemFontSet( FcConfigGetFonts( config, FcSetApplication ) );
-+#endif
-
- #if OSL_DEBUG_LEVEL > 1
- aStep1 = times( &tms );
-@@ -1876,8 +2126,9 @@
- std::list< OString > aEmptyFontsDir;
- for( std::list< OUString >::const_iterator met_dir_it = aMetricDirs.begin(); met_dir_it != aMetricDirs.end(); ++met_dir_it )
- {
-- OString aDir = OUStringToOString( *met_dir_it, aEncoding );
-+ OString aDir = OUStringToOString( *met_dir_it, osl_getThreadTextEncoding() );
-
-+#ifndef FONTCONFIG_FONTS
- // ask the font cache whether it handles this directory
- std::list< PrintFont* > aCacheFonts;
-
-@@ -1907,6 +2158,7 @@
- }
- continue;
- }
-+#endif
-
- DIR* pDIR = opendir( aDir.getStr() );
- if( pDIR )
-@@ -1925,10 +2177,13 @@
- && S_ISREG( aStat.st_mode )
- )
- {
-- OString aFileName( pDirEntry->d_name, strlen( pDirEntry->d_name ) );
-+ OString aFileName( aFile );
- OString aExt( aFileName.copy( aFileName.lastIndexOf( '.' )+1 ) );
- if( aExt.equalsIgnoreAsciiCase( "afm" ) )
- {
-+#ifdef FONTCONFIG_FONTS
-+ addFontFile( aFileName, NULL, true );
-+#else
- ::std::list< PrintFont* > aNewFonts;
-
- analyzeFontFile( nDirID, aFileName, true, aEmptyFontsDir, aNewFonts );
-@@ -1946,6 +2201,7 @@
- else
- delete *it;
- }
-+#endif
- }
- }
- }
-@@ -2102,14 +2358,7 @@
-
- void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const
- {
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a truetype font not analyzed or type1 without metrics read
-- if( pFont->m_eType == fonttype::Type1 )
-- pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms );
-- else if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+ ensureAnalysed( pFont );
-
- fillPrintFontInfo( pFont, static_cast< FastPrintFontInfo& >( rInfo ) );
-
-@@ -2304,6 +2553,7 @@
- const ::rtl::OUString& PrintFontManager::getFontFamily( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-+ ensureAnalysed( pFont );
- return m_pAtoms->getString( ATOM_FAMILYNAME, pFont ? pFont->m_nFamilyName : INVALID_ATOM );
- }
-
-@@ -2367,11 +2617,8 @@
- const ::rtl::OUString& PrintFontManager::getPSName( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-- if( pFont && pFont->m_nPSName == 0 )
-- {
-- if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+
-+ ensureAnalysed( pFont );
-
- return m_pAtoms->getString( ATOM_PSNAME, pFont ? pFont->m_nPSName : INVALID_ATOM );
- }
-@@ -2390,12 +2637,7 @@
- int PrintFontManager::getFontAscend( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a truetype font not yet analyzed
-- if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+ ensureAnalysed( pFont );
- return pFont->m_nAscend;
- }
-
-@@ -2404,12 +2646,7 @@
- int PrintFontManager::getFontDescend( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a truetype font not yet analyzed
-- if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+ ensureAnalysed( pFont );
- return pFont->m_nDescend;
- }
-
-@@ -2418,12 +2655,7 @@
- int PrintFontManager::getFontLeading( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a truetype font not yet analyzed
-- if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+ ensureAnalysed( pFont );
- return pFont->m_nLeading;
- }
-
-@@ -2432,12 +2664,7 @@
- bool PrintFontManager::hasVerticalSubstitutions( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a truetype font not yet analyzed
-- if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+ ensureAnalysed( pFont );
- return pFont->m_bHaveVerticalSubstitutedGlyphs;
- }
-
-@@ -2447,12 +2674,8 @@
- const sal_Unicode* pCharacters, int nCharacters, bool* pHasSubst ) const
- {
- PrintFont* pFont = getFont( nFontID );
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a truetype font not yet analyzed
-- if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+
-+ ensureAnalysed( pFont );
-
- if( ! pFont->m_bHaveVerticalSubstitutedGlyphs )
- memset( pHasSubst, 0, sizeof(bool)*nCharacters );
-@@ -2471,7 +2694,7 @@
- }
-
- // -------------------------------------------------------------------------
--
-+#ifndef FONTCONFIG_FONTS
- OUString PrintFontManager::getFontXLFD( fontID nFontID ) const
- {
- PrintFont* pFont = getFont( nFontID );
-@@ -2484,6 +2707,7 @@
- }
- return aRet;
- }
-+#endif
-
- // -------------------------------------------------------------------------
-
-@@ -2495,6 +2719,7 @@
- if( ! pFont )
- return aEmpty;
-
-+ ensureAnalysed( pFont );
- if( ! pFont->m_pMetrics || ! pFont->m_pMetrics->m_bKernPairsQueried )
- pFont->queryMetricPage( 0, m_pAtoms );
- if( ! pFont->m_pMetrics || ! pFont->m_pMetrics->m_bKernPairsQueried )
-@@ -2548,14 +2773,7 @@
- if( ! pFont )
- return false;
-
-- if( pFont->m_nAscend == 0 && pFont->m_nDescend == 0 )
-- {
-- // might be a font not yet analyzed
-- if( pFont->m_eType == fonttype::Type1 )
-- pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms );
-- else if( pFont->m_eType == fonttype::TrueType )
-- analyzeTrueTypeFile( pFont );
-- }
-+ ensureAnalysed( pFont );
-
- for( int i = 0; i < nLen; i++ )
- {
-@@ -2615,7 +2833,7 @@
- }
-
- // -------------------------------------------------------------------------
--
-+#ifndef FONTCONFIG_FONTS
- static bool createPath( const ByteString& rPath )
- {
- bool bSuccess = false;
-@@ -3245,6 +3463,7 @@
- }
- return rNames.begin() != rNames.end();
- }
-+#endif /* FONTCONFIG_FONTS */
-
- // -------------------------------------------------------------------------
-
-diff -urN psprint-old/source/fontmanager/makefile.mk psprint/source/fontmanager/makefile.mk
---- psprint-old/source/fontmanager/makefile.mk 2003-10-12 23:44:57.000000000 +0200
-+++ psprint/source/fontmanager/makefile.mk 2003-10-13 02:15:28.000000000 +0200
-@@ -79,6 +79,9 @@
- $(SLO)$/fontcache.obj \
- $(SLO)$/parseAFM.obj
-
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+CFLAGS+=$(FONTCONFIG_CFLAGS) -Wall -DFONTCONFIG_FONTS
-+.ENDIF
- .IF "$(OS)$(CPU)"=="SOLARISI"
- NOOPTFILES=$(SLO)$/fontmanager.obj
- .ENDIF
-diff -urN vcl-old/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
---- vcl-old/unx/source/gdi/salgdi3.cxx 2003-10-13 00:13:43.000000000 +0200
-+++ vcl/unx/source/gdi/salgdi3.cxx 2003-10-13 02:08:13.000000000 +0200
-@@ -1778,6 +1778,7 @@
- else
- #endif
- {
-+#ifdef NASTY_X_FONTS
- XlfdStorage* pFonts = _GetDisplay()->GetXlfdList();
-
- for ( int nIdx = 0; nIdx < pFonts->GetCount(); nIdx++ )
-@@ -1790,6 +1791,7 @@
- pFontData->mbEmbeddable = FALSE;
- pList->Add( pFontData );
- }
-+#endif
-
- #ifdef USE_BUILTIN_RASTERIZER
- aX11GlyphPeer.SetDisplay( maGraphicsData.GetXDisplay(),
-@@ -1838,6 +1840,7 @@
-
- void SalGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
- {
-+#ifndef FONTCONFIG_FONTS
- #ifndef _USE_PRINT_EXTENSION_
- if( maGraphicsData.m_pPrinterGfx != NULL )
- {
-@@ -1849,6 +1852,7 @@
- }
- }
- #endif
-+#endif
- }
-
- // ----------------------------------------------------------------------------
-diff -urN psprint-old/util/makefile.mk psprint/util/makefile.mk
---- psprint-old/util/makefile.mk 2003-10-12 23:44:57.000000000 +0200
-+++ psprint/util/makefile.mk 2003-10-13 03:15:24.000000000 +0200
-@@ -99,6 +99,10 @@
- $(SALLIB) \
- -lX11
-
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+SHL1STDLIBS+=$(FONTCONFIG_LIBS)
-+.ENDIF
-+
- SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
- .ENDIF # "$(OS)"=="WNT"
-Index: vcl/unx/source/gdi/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/vcl/unx/source/gdi/makefile.mk,v
-retrieving revision 1.9
-diff -u -r1.9 vcl/unx/source/gdi/makefile.mk
---- vcl/unx/source/gdi/makefile.mk 27 Aug 2002 14:52:35 -0000 1.9
-+++ vcl/unx/source/gdi/makefile.mk 21 Oct 2003 07:45:28 -0000
-@@ -106,6 +106,10 @@
- SLOFILES+=$(SLO)$/salprnpsp.obj
- .ENDIF
-
-+.IF "$(FONTCONFIG_FONTS)" == "YES"
-+CFLAGS+=$(FONTCONFIG_CFLAGS) -DFONTCONFIG_FONTS
-+.ENDIF
-+
- .IF "$(OS)"=="SOLARIS"
- SLOFILES+=$(SLO)$/cdeint.obj
- ENVCFLAGS+=-DUSE_CDE
+++ /dev/null
-Index: vcl/inc/salptype.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/salptype.hxx,v
-retrieving revision 1.1.1.1
-diff -u -p -u -r1.1.1.1 salptype.hxx
---- vcl/inc/salptype.hxx 19 Sep 2000 10:23:06 -0000 1.1.1.1
-+++ vcl/inc/salptype.hxx 29 May 2003 14:09:26 -0000
-@@ -80,8 +80,9 @@
- // - SalPrinterError -
- // -------------------
-
--#define SAL_PRINTER_ERROR_GENERALERROR 1
--#define SAL_PRINTER_ERROR_ABORT 2
-+#define SAL_PRINTER_ERROR_GENERALERROR 1
-+#define SAL_PRINTER_ERROR_ABORT 2
-+#define SAL_PRINTER_ERROR_NO_PRINTER 3
-
-
- // -------------------
-Index: vcl/source/gdi/print.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/gdi/print.cxx,v
-retrieving revision 1.41
-diff -u -p -u -r1.41 print.cxx
---- vcl/source/gdi/print.cxx 15 Apr 2003 16:05:54 -0000 1.41
-+++ vcl/source/gdi/print.cxx 29 May 2003 14:11:18 -0000
-@@ -1694,6 +1694,9 @@ ULONG ImplSalPrinterErrorCodeToVCL( ULON
- case SAL_PRINTER_ERROR_ABORT:
- nVCLError = PRINTER_ABORT;
- break;
-+ case SAL_PRINTER_ERROR_NO_PRINTER:
-+ nVCLError = ERRCODE_IO_NOTEXISTS;
-+ break;
- default:
- nVCLError = PRINTER_GENERALERROR;
- break;
-@@ -1867,6 +1870,8 @@ BOOL Printer::EndJob()
-
- mnCurPage = 0;
-
-+ BOOL success = TRUE;
-+
- if ( mpPrinter )
- {
- mbPrinting = FALSE;
-@@ -1874,7 +1879,13 @@ BOOL Printer::EndJob()
- maJobName.Erase();
-
- mbDevOutput = FALSE;
-- mpPrinter->EndJob();
-+ if (! mpPrinter->EndJob() )
-+ {
-+ mnError = ImplSalPrinterErrorCodeToVCL( mpPrinter->GetErrorCode() );
-+ if ( !mnError )
-+ mnError = PRINTER_GENERALERROR;
-+ success = FALSE;
-+ }
- // Hier den Drucker nicht asyncron zerstoeren, da es
- // W95 nicht verkraftet, wenn gleichzeitig gedruckt wird
- // und ein Druckerobjekt zerstoert wird
-@@ -1885,7 +1896,7 @@ BOOL Printer::EndJob()
- else
- mpQPrinter->EndQueuePrint();
-
-- return TRUE;
-+ return success;
- }
- #else
- ImplSVData* pSVData = ImplGetSVData();
-Index: sfx2/source/view/makefile.mk
-===================================================================
-RCS file: /cvs/framework/sfx2/source/view/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 makefile.mk
---- sfx2/source/view/makefile.mk 18 Jun 2001 10:52:07 -0000 1.4
-+++ sfx2/source/view/makefile.mk 29 May 2003 14:15:19 -0000
-@@ -109,6 +109,8 @@ SLOFILES = \
- $(SLO)$/topfrm.obj \
- $(SLO)$/sfxbasecontroller.obj
-
-+CFLAGS+=`pkg-config --cflags glib-2.0`
-+
- # --- Targets -------------------------------------------------------
-
- .INCLUDE : target.mk
-Index: sfx2/source/view/viewprn.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/view/viewprn.cxx,v
-retrieving revision 1.15
-diff -u -p -u -r1.15 viewprn.cxx
---- sfx2/source/view/viewprn.cxx 17 Apr 2003 16:10:43 -0000 1.15
-+++ sfx2/source/view/viewprn.cxx 29 May 2003 14:17:39 -0000
-@@ -98,6 +98,8 @@
- #include <svtools/printwarningoptions.hxx>
- #pragma hdrstop
-
-+#include <glib.h>
-+
- #include "viewsh.hxx"
- #include "viewimp.hxx"
- #include "viewfrm.hxx"
-@@ -745,14 +747,31 @@ void SfxViewShell::ExecPrint_Impl( SfxRe
- if ( bDontModifyDoc && bOldFlag != pObjSh->IsEnableSetModified() )
- pObjSh->EnableSetModified( bOldFlag );
-
-- if ( nError != PRINTER_ABORT )
-- {
-- // "real" problem (not simply printing cancelled by user)
-- String aMsg( SfxResId( STR_NOSTARTPRINTER ) );
-- if ( !bIsAPI )
-- ErrorBox( NULL, WB_OK | WB_DEF_OK, aMsg ).Execute();
-- rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-- }
-+ String aMsg( SfxResId( STR_NOSTARTPRINTER ) );
-+#ifdef UNX
-+ if ( nError == ERRCODE_IO_NOTEXISTS )
-+ {
-+ ErrorBox box ( NULL, WB_OK | WB_DEF_OK, aMsg );
-+#define BUTTONID_ADD_PRN 77
-+ box.AddButton( ::rtl::OUString( SfxResId( STR_ADDPRINTER ) ),
-+ BUTTONID_ADD_PRN, 0, 0 );
-+ if (box.Execute () == BUTTONID_ADD_PRN)
-+ {
-+ const char *argv[] = { "gnome-cups-add", NULL };
-+ g_spawn_async (NULL, (gchar **)argv,
-+ NULL, G_SPAWN_SEARCH_PATH,
-+ NULL, NULL, NULL, NULL);
-+ }
-+ }
-+ else
-+#endif
-+ if ( nError != PRINTER_ABORT )
-+ {
-+ // "real" problem (not simply printing cancelled by user)
-+ if ( !bIsAPI )
-+ ErrorBox( NULL, WB_OK | WB_DEF_OK, aMsg ).Execute();
-+ rReq.SetReturnValue(SfxBoolItem(0,FALSE));
-+ }
-
- rReq.Ignore();
- }
-Index: sfx2/source/view/view.hrc
-===================================================================
-RCS file: /cvs/framework/sfx2/source/view/view.hrc,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 view.hrc
---- sfx2/source/view/view.hrc 30 Jul 2001 11:15:41 -0000 1.5
-+++ sfx2/source/view/view.hrc 15 Jul 2003 11:58:12 -0000
-@@ -112,6 +112,7 @@
- #define MSG_CANT_CLOSE (RID_SFX_VIEW_START+42)
-
- #define TP_FRAMEPROPERTIES (RID_SFX_VIEW_START+44)
-+#define STR_ADDPRINTER (RID_SFX_VIEW_START+45)
-
- #define FT_FRAMENAME 3
- #define ED_FRAMENAME 4
-Index: sfx2/source/view/view.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/view/view.src,v
-retrieving revision 1.41
-diff -u -p -u -r1.41 view.src
---- sfx2/source/view/view.src 22 Jul 2003 16:18:03 -0000 1.41
-+++ sfx2/source/view/view.src 29 Aug 2003 14:31:34 -0000
-@@ -65,6 +65,12 @@
- #include "sfxlocal.hrc"
-
- // Strings ---------------------------------------------------------------
-+String STR_ADDPRINTER
-+{
-+ TEXT = "Drucker hinzufĂÂŒgen";
-+ TEXT [ English ] = "Add Printer";
-+ TEXT [ english_us ] = "Add Printer";
-+};
- String STR_NODEFPRINTER
- {
- TEXT = "Kein Standarddrucker gefunden.\nBitte wÀhlen Sie einen Drucker aus und versuchen Sie es noch einmal." ;
+++ /dev/null
-Index: psprint/inc/psprint/printergfx.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printergfx.hxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 printergfx.hxx
---- psprint/inc/psprint/printergfx.hxx 26 Mar 2003 14:24:02 -0000 1.10
-+++ psprint/inc/psprint/printergfx.hxx 29 May 2003 14:27:22 -0000
-@@ -237,6 +237,8 @@ private:
- osl::File* mpPageHeader;
- osl::File* mpPageBody;
-
-+ void InitForPrinter( const rtl::OUString &rPrinter );
-+
- void TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut,
- sal_Int32 nXIn, sal_Int32 nYIn )
- { rXOut = nXIn; rYOut = nYIn; }
-Index: psprint/source/printer/jobdata.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/jobdata.cxx,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 jobdata.cxx
---- psprint/source/printer/jobdata.cxx 19 Jun 2002 10:53:34 -0000 1.2
-+++ psprint/source/printer/jobdata.cxx 29 May 2003 14:27:54 -0000
-@@ -205,9 +205,7 @@ bool JobData::constructFromStreamBuffer(
- {
- if( bPrinter )
- {
-- PrinterInfoManager& rManager = PrinterInfoManager::get();
-- const PrinterInfo& rInfo = rManager.getPrinterInfo( rJobData.m_aPrinterName );
-- rJobData.m_pParser = PPDParser::getParser( rInfo.m_aDriverName );
-+ rJobData.m_pParser = PrinterInfoManager::get()->getParserForPrinter( rJobData.m_aPrinterName );
- if( rJobData.m_pParser )
- {
- rJobData.m_aContext.setParser( rJobData.m_pParser );
-Index: psprint/source/printergfx/common_gfx.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printergfx/common_gfx.cxx,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 common_gfx.cxx
---- psprint/source/printergfx/common_gfx.cxx 26 Mar 2003 14:24:07 -0000 1.11
-+++ psprint/source/printergfx/common_gfx.cxx 29 May 2003 14:28:17 -0000
-@@ -102,6 +102,17 @@ GraphicsStatus::GraphicsStatus() :
- * non graphics graphics routines
- */
-
-+void
-+PrinterGfx::InitForPrinter( const ::rtl::OUString &rPrinter )
-+{
-+ const PPDParser *pParser = PrinterInfoManager::get()->getParserForPrinter( rPrinter );
-+
-+ mpFontSubstitutes = PrinterInfoManager::get()->getFontSubstitutesForPrinter( rPrinter );
-+
-+ mbUploadPS42Fonts = pParser ? ( pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-+}
-+
-+
- sal_Bool
- PrinterGfx::Init (PrinterJob &rPrinterJob)
- {
-@@ -113,14 +124,8 @@ PrinterGfx::Init (PrinterJob &rPrinterJo
-
- mnDpi = rPrinterJob.GetResolution();
- rPrinterJob.GetScale (mfScaleX, mfScaleY);
-- const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) );
-- if( mpFontSubstitutes )
-- delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes);
-- if( rInfo.m_bPerformFontSubstitution )
-- mpFontSubstitutes = new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions );
-- else
-- mpFontSubstitutes = NULL;
-- mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-+
-+ InitForPrinter( rPrinterJob.GetPrinterName() );
-
- return sal_True;
- }
-@@ -137,6 +142,7 @@ PrinterGfx::Init (const JobData& rData)
- mnDpi = nRes;
- mfScaleX = (double)72.0 / (double)mnDpi;
- mfScaleY = (double)72.0 / (double)mnDpi;
-+#if 0
- const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) );
- if( mpFontSubstitutes )
- delete const_cast< ::std::hash_map<fontID,fontID>* >(mpFontSubstitutes);
-@@ -145,6 +151,8 @@ PrinterGfx::Init (const JobData& rData)
- else
- mpFontSubstitutes = NULL;
- mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
-+#endif
-+ InitForPrinter( rData.m_aPrinterName );
-
- return sal_True;
- }
-
---- psprint/source/printergfx/printerjob.cxx 2004-03-30 01:22:47.000000000 +0000
-+++ psprint/source/printergfx/printerjob.cxx 2004-03-30 01:24:27.000000000 +0000
-@@ -575,13 +575,7 @@
- }
- else
- {
-- const PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get ();
-- const rtl::OUString& rPrinter = m_aLastJobData.m_aPrinterName;
-- const PrinterInfo& rPrinterInfo = rPrinterInfoManager.getPrinterInfo (rPrinter);
-- const rtl::OUString& rCommand = rPrinterInfo.m_aCommand;
--
-- const rtl::OString aShellCommand = rtl::OUStringToOString (rCommand,
-- RTL_TEXTENCODING_ISO_8859_1);
-+ pDestFILE = PrinterInfoManager::get ()->getPipeToPrinter( m_aLastJobData.m_aPrinterName );
-
- /* Mac OS X: open a pipe only if we are using (1) Darwin5 LPR printing.
- * All other OS X/Darwin cases use spool to file.
-@@ -595,7 +589,6 @@
- #endif
- )
- {
-- pDestFILE = popen (aShellCommand.getStr(), "w");
- if (pDestFILE == NULL)
- return sal_False;
- }
-Index: psprint/inc/psprint/printerinfomanager.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 printerinfomanager.hxx
---- psprint/inc/psprint/printerinfomanager.hxx 10 Jun 2003 14:34:28 -0000 1.4
-+++ psprint/inc/psprint/printerinfomanager.hxx 20 Jun 2003 14:47:18 -0000
-@@ -83,6 +83,20 @@
-
- namespace psp
- {
-+class PrinterInfoManager
-+{
-+ static PrinterInfoManager *pGlobalManager;
-+protected:
-+ static void set (PrinterInfoManager *pManager) { pGlobalManager = pManager; }
-+public:
-+ static PrinterInfoManager *get ();
-+ virtual const PPDParser *getParserForPrinter( ::rtl::OUString rPrinter );
-+ virtual ::std::hash_map< fontID, fontID > *getFontSubstitutesForPrinter( ::rtl::OUString rPrinter );
-+ virtual FILE *getPipeToPrinter( ::rtl::OUString rPrinter );
-+};
-+
-+namespace lpr
-+{
-
- class SystemQueueInfo;
-
-@@ -115,7 +129,7 @@ struct PrinterInfo : JobData
- m_aFontSubstitutions;
- };
-
--class PrinterInfoManager
-+class PrinterInfoManagerLpr : ::psp::PrinterInfoManager
- {
- // needed for checkPrintersChanged: files (not necessarily existant)
- // and their last known modification time
-@@ -155,8 +169,8 @@ class PrinterInfoManager
-
- SystemQueueInfo* m_pQueueInfo;
-
-- PrinterInfoManager();
-- ~PrinterInfoManager();
-+ PrinterInfoManagerLpr();
-+ ~PrinterInfoManagerLpr();
-
- void initialize();
-
-@@ -214,8 +228,14 @@ public:
-
- // similar but returnse whole commandlines
- void getSystemPrintCommands( ::std::list< ::rtl::OUString >& rCommands );
-+
-+ virtual const PPDParser *getParserForPrinter( ::rtl::OUString rPrinter );
-+ virtual ::std::hash_map< fontID, fontID > *getFontSubstitutesForPrinter( ::rtl::OUString rPrinter );
-+ virtual FILE *getPipeToPrinter( ::rtl::OUString rPrinter );
- };
-+
-+} // namespace lpr
-
--} // namespace
-+} // namespace psp
-
- #endif // _PSPRINT_PRINTERINFOMANAGER_HXX_
-Index: psprint/source/printer/printerinfomanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/printerinfomanager.cxx,v
-retrieving revision 1.19
-diff -u -p -u -r1.19 printerinfomanager.cxx
---- psprint/source/printer/printerinfomanager.cxx 12 Jun 2003 11:08:59 -0000 1.19
-+++ psprint/source/printer/printerinfomanager.cxx 23 Jun 2003 13:28:10 -0000
-@@ -62,6 +62,7 @@
- #include <unistd.h>
- #include <sys/wait.h>
- #include <signal.h>
-+#include <stdio.h>
-
- #include <tools/urlobj.hxx>
- #include <tools/stream.hxx>
-@@ -81,10 +82,41 @@
- using namespace psp;
- using namespace rtl;
- using namespace osl;
-+using namespace lpr;
-
- namespace psp
- {
--class SystemQueueInfo : public Thread
-+
-+PrinterInfoManager *::psp::PrinterInfoManager::pGlobalManager = NULL;
-+
-+const ::psp::PPDParser *
-+PrinterInfoManager::getParserForPrinter( ::rtl::OUString rPrinter )
-+{
-+ fprintf( stderr, "error, base PrinterInfoManager::getParserForPrinter\n" );
-+ return NULL;
-+}
-+
-+::std::hash_map< fontID, fontID > *
-+PrinterInfoManager::getFontSubstitutesForPrinter( ::rtl::OUString rPrinter )
-+{ // font mapping tables are a terrible idea.
-+ fprintf( stderr, "error, base PrinterInfoManager::getFontSubstitutesForPrinter\n" );
-+ return NULL;
-+}
-+
-+::psp::PrinterInfoManager *
-+PrinterInfoManager::get ()
-+{
-+ return pGlobalManager;
-+}
-+
-+FILE *
-+PrinterInfoManager::getPipeToPrinter( ::rtl::OUString rPrinter )
-+{
-+ fprintf( stderr, "error, base PrinterInfoManager::getPipeToPrinter\n" );
-+ return NULL;
-+}
-+
-+class psp::lpr::SystemQueueInfo : public Thread
- {
- mutable Mutex m_aMutex;
- bool m_bChanged;
-@@ -106,21 +138,21 @@ class SystemQueueInfo : public Thread
- } // namespace
-
- /*
-- * class PrinterInfoManager
-+ * class PrinterInfoManagerLpr
- */
-
- // -----------------------------------------------------------------
-
--PrinterInfoManager& PrinterInfoManager::get()
-+PrinterInfoManager& PrinterInfoManagerLpr::get()
- {
-- static PrinterInfoManager aManager;
-+ static PrinterInfoManagerLpr aManager;
-
- return aManager;
- }
-
- // -----------------------------------------------------------------
-
--PrinterInfoManager::PrinterInfoManager()
-+PrinterInfoManagerLpr::PrinterInfoManagerLpr()
- {
- m_pQueueInfo = new SystemQueueInfo();
- initialize();
-@@ -128,14 +160,14 @@ PrinterInfoManager::PrinterInfoManager()
-
- // -----------------------------------------------------------------
-
--PrinterInfoManager::~PrinterInfoManager()
-+PrinterInfoManagerLpr::~PrinterInfoManagerLpr()
- {
- delete m_pQueueInfo;
- }
-
- // -----------------------------------------------------------------
-
--bool PrinterInfoManager::checkPrintersChanged()
-+bool PrinterInfoManagerLpr::checkPrintersChanged()
- {
- // check if files were created, deleted or modified since initialize()
-
-@@ -172,7 +204,7 @@ bool PrinterInfoManager::checkPrintersCh
-
- // -----------------------------------------------------------------
-
--void PrinterInfoManager::initialize()
-+void PrinterInfoManagerLpr::initialize()
- {
- rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
- m_aPrinters.clear();
-@@ -542,7 +574,7 @@ void PrinterInfoManager::initialize()
-
- // -----------------------------------------------------------------
-
--void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
-+void PrinterInfoManagerLpr::listPrinters( ::std::list< OUString >& rList ) const
- {
- ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it;
- rList.clear();
-@@ -552,7 +584,7 @@ void PrinterInfoManager::listPrinters( :
-
- // -----------------------------------------------------------------
-
--const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
-+const PrinterInfo& PrinterInfoManagerLpr::getPrinterInfo( const OUString& rPrinter ) const
- {
- static PrinterInfo aEmptyInfo;
- ::std::hash_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
-@@ -564,7 +596,7 @@ const PrinterInfo& PrinterInfoManager::g
-
- // -----------------------------------------------------------------
-
--void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
-+void PrinterInfoManagerLpr::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
- {
- ::std::hash_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
-
-@@ -593,7 +625,7 @@ static bool checkWriteability( const OUS
- return bRet;
- }
-
--bool PrinterInfoManager::writePrinterConfig()
-+bool PrinterInfoManagerLpr::writePrinterConfig()
- {
- // find at least one writeable config
- ::std::hash_map< OUString, Config*, OUStringHash > files;
-@@ -724,7 +756,7 @@ bool PrinterInfoManager::writePrinterCon
-
- // -----------------------------------------------------------------
-
--bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
-+bool PrinterInfoManagerLpr::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
- {
- bool bSuccess = false;
-
-@@ -769,7 +801,7 @@ bool PrinterInfoManager::addPrinter( con
-
- // -----------------------------------------------------------------
-
--bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
-+bool PrinterInfoManagerLpr::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
- {
- bool bSuccess = true;
-
-@@ -823,7 +855,7 @@ bool PrinterInfoManager::removePrinter(
-
- // -----------------------------------------------------------------
-
--bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
-+bool PrinterInfoManagerLpr::setDefaultPrinter( const OUString& rPrinterName )
- {
- bool bSuccess = false;
-
-@@ -841,7 +873,7 @@ bool PrinterInfoManager::setDefaultPrint
-
- // -----------------------------------------------------------------
-
--void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
-+void PrinterInfoManagerLpr::fillFontSubstitutions( PrinterInfo& rInfo ) const
- {
- PrintFontManager& rFontManager( PrintFontManager::get() );
- rInfo.m_aFontSubstitutions.clear();
-@@ -938,7 +970,7 @@ void PrinterInfoManager::fillFontSubstit
-
- // -----------------------------------------------------------------
-
--void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& rCommands )
-+void PrinterInfoManagerLpr::getSystemPrintCommands( std::list< OUString >& rCommands )
- {
- if( m_pQueueInfo->hasChanged() )
- {
-@@ -957,7 +989,7 @@ void PrinterInfoManager::getSystemPrintC
- }
- }
-
--const std::list< OUString >& PrinterInfoManager::getSystemPrintQueues()
-+const std::list< OUString >& PrinterInfoManagerLpr::getSystemPrintQueues()
- {
- if( m_pQueueInfo->hasChanged() )
- {
-@@ -1097,4 +1129,36 @@ void SystemQueueInfo::run()
- m_aQueues = aSysPrintQueues;
- m_aCommand = aPrintCommand;
- }
-+}
-+
-+// --- untested, just to show willing ---
-+
-+const PPDParser *
-+PrinterInfoManagerLpr::getParserForPrinter( ::rtl::OUString rPrinter )
-+{
-+ PrinterInfo rInfo( getPrinterInfo( rPrinter ) );
-+ return rInfo.m_pParser;
-+}
-+
-+::std::hash_map< fontID, fontID > *
-+PrinterInfoManagerLpr::getFontSubstitutesForPrinter( ::rtl::OUString rPrinter )
-+{
-+ PrinterInfo rInfo( getPrinterInfo( rPrinter ) );
-+
-+ if( !rInfo.m_bPerformFontSubstitution )
-+ return NULL;
-+
-+ return new ::std::hash_map< fontID, fontID >( rInfo.m_aFontSubstitutions );
-+}
-+
-+FILE *
-+PrinterInfoManagerLpr::getPipeToPrinter( ::rtl::OUString rPrinter )
-+{
-+ const PrinterInfo& rPrinterInfo = getPrinterInfo (rPrinter);
-+ const rtl::OUString& rCommand = rPrinterInfo.m_aCommand;
-+
-+ const rtl::OString aShellCommand = rtl::OUStringToOString
-+ ( rCommand, RTL_TEXTENCODING_ISO_8859_1);
-+
-+ return popen (aShellCommand.getStr(), "w");
- }
+++ /dev/null
-Index: psprint/source/printer/printerinfomanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/printer/printerinfomanager.cxx,v
-retrieving revision 1.19
-diff -u -p -u -r1.19 printerinfomanager.cxx
---- psprint/source/printer/printerinfomanager.cxx 12 Jun 2003 11:08:59 -0000 1.19
-+++ psprint/source/printer/printerinfomanager.cxx 6 Oct 2003 14:14:07 -0000
-@@ -405,11 +437,9 @@ void PrinterInfoManager::initialize()
- if( aValue.Len() )
- aPrinter.m_aInfo.m_eOrientation = aValue.EqualsIgnoreCaseAscii( "Landscape" ) ? orientation::Landscape : orientation::Portrait;
-
-+ aValue = aConfig.ReadKey( "Scale" );
- if( aValue.Len() )
-- {
-- aValue = aConfig.ReadKey( "Scale" );
- aPrinter.m_aInfo.m_nScale = aValue.ToInt32();
-- }
-
- aValue = aConfig.ReadKey( "MarginAdjust" );
- if( aValue.Len() )
+++ /dev/null
-Index: scp/source/psprint/files_psprint.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/psprint/files_psprint.scp,v
-retrieving revision 1.16
-diff -u -p -u -r1.16 files_psprint.scp
---- scp/source/psprint/files_psprint.scp 16 Jul 2003 18:17:25 -0000 1.16
-+++ scp/source/psprint/files_psprint.scp 28 Jul 2003 17:00:18 -0000
-@@ -283,6 +283,8 @@ File GID_FILE_SHARE_PSPRINT_FONTMETRIC_B
- Styles = (DELETE_ONLY,CHECK_TIMESTAMP);
- End
-
-+#if 0 /* kill spadmin */
-+
- #ifndef SRV_PRODUCT
-
- File GID_FILE_BIN_SPADMIN_BIN
-@@ -333,3 +335,4 @@ STD_RES_FILE( GID_FILE_RES_SPA, spa )
-
- #endif
-
-+#endif /* kill spadmin */
-\ No newline at end of file
+++ /dev/null
-diff -u -p -u -r1.1 SGENPRT.PS
---- psprint_config/configuration/ppds/SGENPRT.PS
-+++ psprint_config/configuration/ppds/SGENPRT.PS
-@@ -28,6 +28,8 @@
- *NickName: "Generic Printer"
- *PCFileName: "SGENPRT.PPD"
-
-+*% CUPS can cope, and fixes some symbol issues
-+*TTRasterizer: Type42
-
- *% ===== Basic Capabilities and Defaults =====
-
+++ /dev/null
---- oo_641c_src/psprint/source/printergfx/psheader.ps.psprint-euro Fri Jul 6 18:10:16 2001
-+++ oo_641c_src/psprint/source/printergfx/psheader.ps Mon Mar 4 11:01:54 2002
-@@ -303,7 +303,7 @@
- /h /i /j /k /l /m /n /o
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde /unused
-- /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
-+ /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused
- /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis
+++ /dev/null
---- psprint/source/helper/helper.cxx.orig 2003-08-08 08:41:05.000000000 -0700
-+++ psprint/source/helper/helper.cxx 2003-08-08 08:43:33.000000000 -0700
-@@ -72,7 +72,9 @@
- #include <tools/config.hxx>
- #include <rtl/bootstrap.hxx>
- #include <sal/config.h>
-+#ifdef SOLAR_JAVA
- #include "jvmaccess/javainfo.hxx"
-+#endif // SOLAR_JAVA
-
- using namespace rtl;
-
-@@ -263,6 +265,7 @@
- }
- }
-
-+#ifdef SOLAR_JAVA
- // if no javarc (e.g. in setup) exists or it failed try the UDK method
- if( ! aJREpath.getLength() )
- {
-@@ -299,6 +302,7 @@
- }
- }
- }
-+#endif // SOLAR_JAVA
-
- if( aJREpath.getLength() )
- {
---- psprint-old/util/makefile.mk 2003-10-13 03:19:55.000000000 +0200
-+++ psprint/util/makefile.mk 2003-10-13 03:17:08.000000000 +0200
-@@ -95,6 +95,5 @@
-
- SHL1STDLIBS=$(UNOTOOLSLIB) \
- $(TOOLSLIB) \
-- $(JVMACCESSLIB) \
- $(SALLIB) \
- -lX11
-
-.IF "$(FONTCONFIG_FONTS)" == "YES"
- SHL1STDLIBS+=`pkg-config --libs fontconfig`
- .ENDIF
-+.IF "$(SOLAR_JAVA)" != ""
-+SHL1STDLIBS+=$(JVMACCESSLIB)
-+.ENDIF
-
- SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
+++ /dev/null
---- readlicense_oo/util/makefile.pmk.orig 2003-09-22 11:36:10.000000000 -0700
-+++ readlicense_oo/util/makefile.pmk 2003-09-22 11:37:57.000000000 -0700
-@@ -73,7 +73,36 @@
-
- $(MISC)$/%.html :
- @+-$(MKDIR) $(@:d)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=html file=$@
-+.ELSE
-+ $(SED) 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl
-+ $(XSLTPROC) -o $@ \
-+ --stringparam os1 $(OS) \
-+ --stringparam gui1 $(GUI) \
-+ --stringparam cp1 $(CPUNAME) \
-+ --stringparam com1 $(COM) \
-+ --stringparam lang1 $(iso_$(@:d:d:b)) \
-+ --stringparam type html \
-+ ..$/readme2.xsl \
-+ $(subst,$(@::d:d:b), $(@:b).xrm)
-+ rm ..$/readme2.xsl
-+.ENDIF
-+
- $(MISC)$/%.txt :
- @+-$(MKDIR) $(@:d)
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=text file=$@
-+.ELSE
-+ $(SED) 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl
-+ $(XSLTPROC) -o $@ \
-+ --stringparam os1 $(OS) \
-+ --stringparam gui1 $(GUI) \
-+ --stringparam cp1 $(CPUNAME) \
-+ --stringparam com1 $(COM) \
-+ --stringparam lang1 $(iso_$(@:d:d:b)) \
-+ --stringparam type text \
-+ ..$/readme2.xsl \
-+ $(subst,$(@::d:d:b), $(@:b).xrm)
-+ rm ..$/readme2.xsl
-+.ENDIF
+++ /dev/null
---- svtools/util/makefile.mk.orig 2003-06-05 22:18:51.000000000 -0500
-+++ svtools/util/makefile.mk 2003-06-05 22:19:38.000000000 -0500
-@@ -233,6 +233,10 @@
- $(VOSLIB) \
- $(SALLIB)
-
-+.IF "$(GUI)"=="UNX"
-+SHL2STDLIBS+= $(EXPATASCII3RDLIB) `pkg-config --libs glib-2.0`
-+.ENDIF
-+
- .IF "$(GUI)"=="WNT"
- SHL2STDLIBS+= \
- uwinapi.lib \
---- svtools/source/config/makefile.mk.orig 2003-06-05 22:19:59.000000000 -0500
-+++ svtools/source/config/makefile.mk 2003-06-05 22:21:02.000000000 -0500
-@@ -107,7 +107,13 @@
- $(SLO)$/accessibilityoptions.obj \
- $(SLO)$/cmdoptions.obj \
- $(SLO)$/extendedsecurityoptions.obj \
-- $(SLO)$/sourceviewconfig.obj
-+ $(SLO)$/sourceviewconfig.obj \
-+ $(SLO)$/recent-files.obj
-+
-+.IF "$(GUI)"=="UNX"
-+CFLAGS+=-Wall
-+CFLAGS+=`pkg-config --cflags glib-2.0`
-+.ENDIF
-
- EXCEPTIONSFILES = \
- $(SLO)$/accelcfg.obj \
---- svtools/prj/build.lst.orig 2003-06-05 22:23:34.000000000 -0500
-+++ svtools/prj/build.lst 2003-06-05 22:23:42.000000000 -0500
-@@ -1,4 +1,4 @@
--st svtools : offuh toolkit ucbhelper unotools jpeg NULL
-+st svtools : offuh toolkit ucbhelper unotools jpeg expat NULL
- st svtools usr1 - all st_mkout NULL
- st svtools\inc get - all st_inc NULL
- st svtools\inc\sane get - all st_incsa NULL
---- svtools/inc/historyoptions.hxx.orig 2003-06-05 22:25:11.000000000 -0500
-+++ svtools/inc/historyoptions.hxx 2003-06-05 22:26:05.000000000 -0500
-@@ -239,6 +239,7 @@
- @param "eHistory" select right history.
- @param "sURL" URL to save in history
- @param "sFilter" filter name to save in history
-+ @param "sMimeType" MIME type of the URL; used only for ePICKLIST.
- @param "sTitle" document title to save in history
- @param "sPassword" password to save in history
- @return -
-@@ -249,6 +250,7 @@
- void AppendItem( EHistoryType eHistory ,
- const ::rtl::OUString& sURL ,
- const ::rtl::OUString& sFilter ,
-+ const ::rtl::OUString& sMimeType ,
- const ::rtl::OUString& sTitle ,
- const ::rtl::OUString& sPassword );
-
---- svtools/source/config/historyoptions.cxx.orig 2003-06-05 22:26:20.000000000 -0500
-+++ svtools/source/config/historyoptions.cxx 2003-06-05 23:12:47.000000000 -0500
-@@ -95,6 +95,8 @@
- #include <algorithm>
- #endif
-
-+#include "recent-files.hxx"
-+
- //_________________________________________________________________________________________________________________
- // namespaces
- //_________________________________________________________________________________________________________________
-@@ -403,8 +405,10 @@
- sal_uInt32 nPosition = FIXPROPERTYCOUNT; // step over first three readed size values! but count begins at 0!
- // Get names/values for picklist.
- // 4 subkeys for every item!
-+ sal_uInt32 nItem;
-+#if 0
- OUString sName;
-- for( sal_uInt32 nItem=0; nItem<nPicklistCount; ++nItem )
-+ for( nItem=0; nItem<nPicklistCount; ++nItem )
- {
- seqValues[nPosition] >>= aItem.sURL ;
- ++nPosition;
-@@ -416,6 +420,26 @@
- ++nPosition;
- m_aPicklist.push_back( aItem );
- }
-+#endif
-+ /* The user may already have a pick list from OOo, so we have to skip over it --- we now fetch the list from GNOME */
-+ nPosition += nPicklistCount * 4;
-+
-+ ::svt::RecentFileItem *items;
-+ int nItems;
-+ int i;
-+
-+ ::svt::recentFilesGetList (&items, &nItems);
-+
-+ aItem.sFilter = OUString ("", 0, RTL_TEXTENCODING_ASCII_US);
-+ aItem.sPassword = OUString ("", 0, RTL_TEXTENCODING_ASCII_US);
-+
-+ for (i = 0; i < nItems; i++) {
-+ aItem.sURL = OUString(items[i].uri);
-+ aItem.sTitle = OUString (items[i].uri); /* We don't have a title, so just use the filename */
-+ m_aPicklist.push_back (aItem);
-+ }
-+
-+ ::svt::recentFilesFree (items, nItems);
-
- // Attention: Don't reset nPosition here!
-
-@@ -506,9 +530,11 @@
- OUString sNode ;
- Sequence< PropertyValue > seqPropertyValues( 4 ) ;
-
-+ sal_uInt32 nItem;
-+#if 0
- // Copy picklist entries to save-list!
- sal_uInt32 nPicklistCount = m_aPicklist.size();
-- for( sal_uInt32 nItem=0; nItem<nPicklistCount; ++nItem )
-+ for( nItem=0; nItem<nPicklistCount; ++nItem )
- {
- aItem = m_aPicklist[nItem];
- sNode = PROPERTYNAME_PICKLIST + PATHDELIMITER + FIXP + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
-@@ -523,7 +549,7 @@
-
- SetSetProperties( PROPERTYNAME_PICKLIST, seqPropertyValues );
- }
--
-+#endif
- // Copy URL-list entries to save-list!
- sal_uInt32 nHistoryCount = m_aHistory.size();
- for( nItem=0; nItem<nHistoryCount; ++nItem )
-@@ -909,11 +935,16 @@
- void SvtHistoryOptions::AppendItem( EHistoryType eHistory ,
- const OUString& sURL ,
- const OUString& sFilter ,
-+ const OUString& sMimeType ,
- const OUString& sTitle ,
- const OUString& sPassword )
- {
- MutexGuard aGuard( GetOwnStaticMutex() );
-- m_pDataContainer->AppendItem( eHistory, sURL, sFilter, sTitle, sPassword );
-+
-+ if (eHistory == ePICKLIST)
-+ ::svt::recentFilesAddItem (sURL.pData, sMimeType.pData);
-+ else
-+ m_pDataContainer->AppendItem( eHistory, sURL, sFilter, sTitle, sPassword );
- }
-
- //*****************************************************************************************************************
---- sfx2/source/appl/newhelp.cxx.orig 2003-06-05 22:34:06.000000000 -0500
-+++ sfx2/source/appl/newhelp.cxx 2003-06-05 22:35:03.000000000 -0500
-@@ -1383,7 +1383,7 @@
- {
- String aTitle = GetEntry(i);
- String* pURL = (String*)(ULONG)GetEntryData(i);
-- aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, rtl::OUString( aTitle ), sEmpty );
-+ aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, sEmpty, rtl::OUString( aTitle ), sEmpty );
- delete pURL;
- }
- }
---- sfx2/source/appl/sfxpicklist.cxx.orig 2003-04-11 10:54:18.000000000 -0500
-+++ sfx2/source/appl/sfxpicklist.cxx 2003-06-05 22:46:10.000000000 -0500
-@@ -461,6 +461,7 @@
- SvtHistoryOptions().AppendItem( eHISTORY,
- aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
- aFilter,
-+ ::rtl::OUString(),
- aTitle,
- SfxStringEncode( aURL.GetPass() ) );
- }
-@@ -497,17 +498,21 @@
-
- ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST);
- ::rtl::OUString aFilter;
-+ ::rtl::OUString aMimeType;
-
- INetURLObject aURL( pMed->GetOrigURL() );
- const SfxFilter* pFilter = pMed->GetOrigFilter();
-
-- if ( pFilter )
-+ if ( pFilter ) {
- aFilter = pFilter->GetFilterName();
-+ aMimeType = pFilter->GetMimeType();
-+ }
-
- // add to svtool history options
- SvtHistoryOptions().AppendItem( ePICKLIST,
- aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
- aFilter,
-+ aMimeType,
- aTitle,
- SfxStringEncode( aURL.GetPass() ) );
-
---- sd/source/ui/dlg/dlgass.cxx.orig 2003-06-05 23:00:04.000000000 -0500
-+++ sd/source/ui/dlg/dlgass.cxx 2003-06-05 23:05:19.000000000 -0500
-@@ -186,6 +186,12 @@
- #include <sfx2/filedlghelper.hxx>
- #endif
-
-+#include <com/sun/star/system/XSystemShellExecute.hpp>
-+#include <com/sun/star/document/XTypeDetection.hpp>
-+#include <com/sun/star/util/URL.hpp>
-+#include <com/sun/star/util/XURLTransformer.hpp>
-+#include <sfx2/fcontnr.hxx>
-+
- #include "sdpage.hxx"
- #include "helpids.h"
- #include "assclass.hxx"
-@@ -198,6 +204,8 @@
-
- using namespace ::com::sun::star;
- using namespace ::sd;
-+using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::system;
-
-
- void InterpolateFixedBitmap( FixedBitmap * pBitmap )
-@@ -774,7 +782,38 @@
- m_pWindow = NULL;
- }
-
-+/* Queries the name of the filter that we can use to open a file */
-+static const String &
-+getFilterNameForFile (rtl_uString *uri)
-+{
-+ Reference< ::com::sun::star::document::XTypeDetection > type_detection (
-+ ::comphelper::getProcessServiceFactory ()->createInstance (
-+ ::rtl::OUString::createFromAscii ("com.sun.star.comp.framework.TypeDetection" )),
-+ UNO_QUERY );
-
-+ if (!type_detection.is())
-+ return;
-+
-+ ::com::sun::star::util::URL url;
-+ ::rtl::OUString type_name;
-+
-+ url.Complete = uri;
-+
-+ Reference < ::com::sun::star::util::XURLTransformer > trans (
-+ ::comphelper::getProcessServiceFactory ()->createInstance (
-+ ::rtl::OUString::createFromAscii ("com.sun.star.util.URLTransformer" )),
-+ UNO_QUERY);
-+
-+ trans->parseStrict (url);
-+
-+ type_name = type_detection->queryTypeByURL (url.Main);
-+ SfxFilterMatcher &filter_matcher = SFX_APP ()->GetFilterMatcher ();
-+ const SfxFilter *filter = filter_matcher.GetFilter4EA (type_name);
-+ if (!filter)
-+ return String ();
-+
-+ return filter->GetFilterName ();
-+}
-
-
- void AssistentDlgImpl::ScanDocmenu (void)
-@@ -808,6 +847,10 @@
- else if (aPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_PASSWORD)
- aPropertySet[nProperty].Value >>= sPassword;
-
-+ sFilter = rtl::OUString (getFilterNameForFile (sURL.pData).GetBuffer ());
-+ if (sFilter.getLength () == 0)
-+ continue;
-+
- // If the entry is an impress file then insert it into the
- // history list and the list box.
- uno::Any aFilterPropSet = xFilterFactory->getByName( sFilter );
---- svtools/source/config/recent-files.hxx 2003-01-30 04:24:37.000000000 -0600
-+++ svtools/source/config/recent-files.hxx 2003-06-05 23:10:17.000000000 -0500
-@@ -0,0 +1,30 @@
-+#ifndef RECENT_FILES_HXX
-+#define RECENT_FILES_HXX
-+
-+#ifndef _RTL_USTRING_
-+#include <rtl/ustring.h>
-+#endif
-+
-+#include <time.h>
-+
-+namespace svt {
-+
-+/* A recent file item */
-+struct RecentFileItem {
-+ rtl_uString *uri; /* URI of the file */
-+ rtl_uString *mimeType; /* MIME type */
-+ time_t timestamp; /* Timestamp for when the item was added */
-+};
-+
-+/* Queries the list of recent file items for OpenOffice.org */
-+void recentFilesGetList (RecentFileItem **items, int *nItems);
-+
-+/* Frees an array of RecentFileItem structures */
-+void recentFilesFree (RecentFileItem *items, int nItems);
-+
-+/* Adds an item to the list of recent file items */
-+void recentFilesAddItem (rtl_uString *uri, const rtl_uString *mimeType);
-+
-+};
-+
-+#endif
---- svtools/source/config/recent-files.cxx 2003-01-30 04:24:37.000000000 -0600
-+++ svtools/source/config/recent-files.cxx 2003-06-05 23:28:52.000000000 -0500
-@@ -0,0 +1,802 @@
-+#include <stdio.h>
-+#include <string.h>
-+#include <time.h>
-+#include <unistd.h>
-+#include <sys/file.h>
-+#include <glib.h>
-+#include <tools/string.hxx>
-+#include "expat/xmlparse.h"
-+#include "recent-files.hxx"
-+
-+namespace svt {
-+
-+/*
-+ example:
-+<?xml version="1.0"?>
-+<RecentFiles>
-+ <RecentItem>
-+ <URI>file:///home/federico/gedit.txt</URI>
-+ <Mime-Type>text/plain</Mime-Type>
-+ <Timestamp>1046485966</Timestamp>
-+ <Groups>
-+ <Group>gedit</Group>
-+ </Groups>
-+ </RecentItem>
-+ <RecentItem>
-+ <URI>file:///home/federico/gedit-2.2.0.tar.bz2</URI>
-+ <Mime-Type>application/x-bzip</Mime-Type>
-+ <Timestamp>1046209851</Timestamp>
-+ <Private/>
-+ <Groups>
-+ </Groups>
-+ </RecentItem>
-+</RecentFiles>
-+*/
-+
-+/* Name of the standard ~/.recently-used file */
-+#define RECENT_FILE_NAME ".recently-used"
-+
-+/* Items without a MIME type get assigned this by default */
-+#define APPLICATION_OCTET_STREAM "application/octet-stream"
-+
-+/* Buffer size for reading ~/.recently-used */
-+#define BUFFER_SIZE 16384
-+
-+/* Maximum number of entries to keep before pruning */
-+#define MAX_ITEMS 20
-+
-+/* The group we use for OO.o files */
-+#define GROUP_OPENOFFICE_ORG "OpenOffice.org"
-+
-+/* Tags we understand in the ~/.recently-used XML */
-+#define TAG_RECENT_FILES "RecentFiles"
-+#define TAG_RECENT_ITEM "RecentItem"
-+#define TAG_URI "URI"
-+#define TAG_MIME_TYPE "Mime-Type"
-+#define TAG_TIMESTAMP "Timestamp"
-+#define TAG_PRIVATE "Private"
-+#define TAG_GROUPS "Groups"
-+#define TAG_GROUP "Group"
-+
-+/* Recent item as parsed from the file */
-+struct Item {
-+ char *uri;
-+ char *mimeType;
-+ time_t timestamp;
-+ gboolean isPrivate;
-+ GSList *groups;
-+};
-+
-+/* Parser state */
-+enum State {
-+ STATE_BEGIN, /* No elements read yet */
-+ STATE_RECENT_FILES, /* Inside the toplevel RecentFiles element */
-+ STATE_RECENT_ITEM, /* Inside RecentItem */
-+ STATE_URI, /* Inside URI */
-+ STATE_MIME_TYPE, /* Inside Mime-Type */
-+ STATE_TIMESTAMP, /* Inside Timestamp */
-+ STATE_PRIVATE, /* Inside Private */
-+ STATE_GROUPS, /* Inside Groups */
-+ STATE_GROUP, /* Inside Group */
-+ STATE_END, /* Finished parsing the toplevel element */
-+ STATE_ERROR /* Bad XML */
-+};
-+
-+/* XML parsing context */
-+struct ParseContext {
-+ GSList *items;
-+
-+ State state;
-+};
-+
-+/* Computes the name of the ~/.recent-files file */
-+static char *
-+getRecentFilename (void)
-+{
-+ return g_strdup_printf ("%s/" RECENT_FILE_NAME, g_get_home_dir ());
-+}
-+
-+/* Returns whether a string is null or empty */
-+static gboolean
-+stringIsEmpty (const char *s)
-+{
-+ return (s == NULL || strlen (s) == 0);
-+}
-+
-+/* Frees the contents of str, if any, and g_strdup()s the newStr into it */
-+static void
-+replaceString (char **str, const char *newStr, int newStrLen)
-+{
-+ g_free (*str);
-+ *str = g_strndup (newStr, newStrLen);
-+}
-+
-+/* Creates a new item in the context as a result of entering a RecentItem element */
-+static void
-+startRecentItem (ParseContext *context)
-+{
-+ Item *item;
-+
-+ item = g_new (Item, 1);
-+
-+ item->uri = NULL;
-+ item->mimeType = NULL;
-+ item->timestamp = -1;
-+ item->isPrivate = FALSE;
-+ item->groups = NULL;
-+
-+ context->items = g_slist_prepend (context->items, item);
-+}
-+
-+/* Frees an Item */
-+static void
-+freeItem (Item *item)
-+{
-+ GSList *l;
-+
-+ g_free (item->uri);
-+ g_free (item->mimeType);
-+
-+ for (l = item->groups; l; l = l->next) {
-+ char *group;
-+
-+ group = l->data;
-+ g_free (group);
-+ }
-+ g_slist_free (item->groups);
-+
-+ g_free (item);
-+}
-+
-+/* Terminates a RecentItem element by ensuring that the basic properties of the
-+ * current are fulfilled. If the URI is empty, removes the item from the
-+ * context.
-+ */
-+static void
-+endRecentItem (ParseContext *context)
-+{
-+ Item *item;
-+ GSList *listItem;
-+
-+ g_assert (context->items != NULL);
-+ item = context->items->data;
-+
-+ if (stringIsEmpty (item->uri)) {
-+ freeItem (item);
-+ context->items = g_slist_delete_link (context->items, context->items);
-+ return;
-+ }
-+
-+ if (stringIsEmpty (item->mimeType))
-+ replaceString (&item->mimeType, APPLICATION_OCTET_STREAM, strlen (APPLICATION_OCTET_STREAM));
-+
-+ if (item->timestamp == -1)
-+ item->timestamp = time (NULL);
-+}
-+
-+/* Handles entering a Private element */
-+static void
-+startPrivate (ParseContext *context)
-+{
-+ Item *item;
-+
-+ g_assert (context->items != NULL);
-+ item = context->items->data;
-+
-+ item->isPrivate = TRUE;
-+}
-+
-+/* Start element handler for the parser */
-+static void
-+startElementCb (void *data, const XML_Char *name, const XML_Char **attributes)
-+{
-+ ParseContext *context;
-+
-+ context = data;
-+
-+ if (context->state == STATE_ERROR || context->state == STATE_END)
-+ return;
-+
-+ switch (context->state) {
-+ case STATE_BEGIN:
-+ if (strcmp (name, TAG_RECENT_FILES) == 0)
-+ context->state = STATE_RECENT_FILES;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_RECENT_FILES:
-+ if (strcmp (name, TAG_RECENT_ITEM) == 0) {
-+ startRecentItem (context);
-+ context->state = STATE_RECENT_ITEM;
-+ } else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_RECENT_ITEM:
-+ if (strcmp (name, TAG_URI) == 0)
-+ context->state = STATE_URI;
-+ else if (strcmp (name, TAG_MIME_TYPE) == 0)
-+ context->state = STATE_MIME_TYPE;
-+ else if (strcmp (name, TAG_TIMESTAMP) == 0)
-+ context->state = STATE_TIMESTAMP;
-+ else if (strcmp (name, TAG_PRIVATE) == 0) {
-+ startPrivate (context);
-+ context->state = STATE_PRIVATE;
-+ } else if (strcmp (name, TAG_GROUPS) == 0)
-+ context->state = STATE_GROUPS;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_URI:
-+ case STATE_MIME_TYPE:
-+ case STATE_TIMESTAMP:
-+ case STATE_PRIVATE:
-+ case STATE_GROUP:
-+ case STATE_END:
-+ case STATE_ERROR:
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_GROUPS:
-+ if (strcmp (name, TAG_GROUP) == 0)
-+ context->state = STATE_GROUP;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ default:
-+ g_assert_not_reached ();
-+ }
-+}
-+
-+/* End element handler for the parser */
-+static void
-+endElementCb (void *data, const XML_Char *name)
-+{
-+ ParseContext *context;
-+
-+ context = data;
-+
-+ switch (context->state) {
-+ case STATE_RECENT_FILES:
-+ if (strcmp (name, TAG_RECENT_FILES) == 0)
-+ context->state = STATE_END;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_RECENT_ITEM:
-+ if (strcmp (name, TAG_RECENT_ITEM) == 0) {
-+ endRecentItem (context);
-+ context->state = STATE_RECENT_FILES;
-+ } else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_URI:
-+ if (strcmp (name, TAG_URI) == 0)
-+ context->state = STATE_RECENT_ITEM;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_MIME_TYPE:
-+ if (strcmp (name, TAG_MIME_TYPE) == 0)
-+ context->state = STATE_RECENT_ITEM;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_TIMESTAMP:
-+ if (strcmp (name, TAG_TIMESTAMP) == 0)
-+ context->state = STATE_RECENT_ITEM;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_PRIVATE:
-+ if (strcmp (name, TAG_PRIVATE) == 0) {
-+ startPrivate (context); /* I don't know if expat calls the start or end element handler for <foo/> */
-+ context->state = STATE_RECENT_ITEM;
-+ } else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_GROUPS:
-+ if (strcmp (name, TAG_GROUPS) == 0)
-+ context->state = STATE_RECENT_ITEM;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_GROUP:
-+ if (strcmp (name, TAG_GROUP) == 0)
-+ context->state = STATE_GROUPS;
-+ else
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ case STATE_BEGIN:
-+ case STATE_END:
-+ case STATE_ERROR:
-+ context->state = STATE_ERROR;
-+ break;
-+
-+ default:
-+ g_assert_not_reached ();
-+ }
-+}
-+
-+/* Sets the timestamp field of an Item */
-+static void
-+setTimestamp (Item *item, const char *s, int len)
-+{
-+ char *dup;
-+ long t;
-+
-+ dup = g_strndup (s, len);
-+ if (sscanf (dup, "%ld", &t) != 1)
-+ item->timestamp = -1;
-+ else
-+ item->timestamp = t;
-+
-+ g_free (dup);
-+}
-+
-+/* Adds a group to an item */
-+static void
-+addGroup (Item *item, const char *s, int len)
-+{
-+ GSList *l;
-+
-+ for (l = item->groups; l; l = l->next) {
-+ const char *group;
-+
-+ group = l->data;
-+ if (strncmp (group, s, len) == 0)
-+ return;
-+ }
-+
-+ item->groups = g_slist_prepend (item->groups, g_strndup (s, len));
-+}
-+
-+/* Handler for character data between tags */
-+static void
-+characterDataCb (void *data, const XML_Char *s, int len)
-+{
-+ ParseContext *context;
-+ Item *item;
-+
-+ context = data;
-+ item = context->items ? context->items->data : NULL;
-+
-+ switch (context->state) {
-+ case STATE_URI:
-+ replaceString (&item->uri, s, len);
-+ break;
-+
-+ case STATE_MIME_TYPE:
-+ replaceString (&item->mimeType, s, len);
-+ break;
-+
-+ case STATE_TIMESTAMP:
-+ setTimestamp (item, s, len);
-+ break;
-+
-+ case STATE_GROUP:
-+ addGroup (item, s, len);
-+ break;
-+
-+ case STATE_BEGIN:
-+ case STATE_RECENT_FILES:
-+ case STATE_RECENT_ITEM:
-+ case STATE_PRIVATE:
-+ case STATE_GROUPS:
-+ case STATE_END:
-+ case STATE_ERROR:
-+ /* Ignore character data that may appear elsewhere */
-+ break;
-+
-+ default:
-+ g_assert_not_reached ();
-+ }
-+}
-+
-+/* Creates an XML parser for .recent-files */
-+static XML_Parser
-+createParser (ParseContext *context)
-+{
-+ XML_Parser parser;
-+
-+ parser = XML_ParserCreate (NULL);
-+ if (!parser)
-+ return NULL;
-+
-+ XML_SetUserData (parser, context);
-+ XML_SetElementHandler (parser, startElementCb, endElementCb);
-+ XML_SetCharacterDataHandler (parser, characterDataCb);
-+
-+ return parser;
-+}
-+
-+/* Compares items by timestamps so as to sort them in DECREASING order */
-+static gint
-+compareTimestampsCb (gconstpointer a, gconstpointer b, gpointer data)
-+{
-+ Item *ia, *ib;
-+ time_t ta, tb;
-+
-+ ia = a;
-+ ta = ia->timestamp;
-+
-+ ib = b;
-+ tb = ib->timestamp;
-+
-+ return (ta < tb) ? 1 : (ta > tb) ? -1 : 0;
-+}
-+
-+/* Returns whether an item has a certain group */
-+static gboolean
-+hasGroup (Item *item, const char *group)
-+{
-+ GSList *l;
-+
-+ for (l = item->groups; l; l = l->next) {
-+ const char *g;
-+
-+ g = l->data;
-+ if (strcmp (g, group) == 0)
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
-+/* Removes the oldest items from the context */
-+static void
-+trimOldItems (ParseContext *context)
-+{
-+ GSList *l, *next;
-+ int i;
-+
-+ i = 0;
-+ l = context->items;
-+
-+ while (l) {
-+ Item *item;
-+
-+ item = l->data;
-+ next = l->next;
-+
-+ if (hasGroup (item, GROUP_OPENOFFICE_ORG)) {
-+ i++;
-+
-+ if (i > MAX_ITEMS) {
-+ freeItem (item);
-+ context->items = g_slist_remove_link (context->items, l);
-+ g_slist_free_1 (l);
-+ }
-+ }
-+
-+ l = next;
-+ }
-+}
-+
-+/* Parses the file and fills in the context */
-+static void
-+parse (FILE *file, ParseContext *context)
-+{
-+ XML_Parser parser;
-+ char buf[BUFFER_SIZE];
-+
-+ context->items = NULL;
-+ context->state = STATE_BEGIN;
-+
-+ parser = createParser (context);
-+
-+ if (!parser)
-+ return FALSE;
-+
-+ while (1) {
-+ int len;
-+ gboolean eof;
-+
-+ len = fread (buf, 1, sizeof (buf), file);
-+ if (ferror (file))
-+ break;
-+
-+ eof = feof (file);
-+
-+ if (!XML_Parse (parser, buf, len, eof)) {
-+ context->state = STATE_ERROR;
-+ break;
-+ }
-+
-+ if (eof)
-+ break;
-+ }
-+
-+ if (context->items)
-+ endRecentItem (context); /* Finish it off for if we terminated prematurely on error */
-+
-+ XML_ParserFree (parser);
-+
-+ context->items = g_slist_sort (context->items, compareTimestampsCb);
-+ trimOldItems (context);
-+}
-+
-+/* Frees the contents of a parse context */
-+static void
-+freeContext(ParseContext *context)
-+{
-+ GSList *l;
-+
-+ for (l = context->items; l; l = l->next) {
-+ Item *item;
-+
-+ item = l->data;
-+ freeItem (item);
-+ }
-+
-+ g_slist_free (context->items);
-+}
-+
-+/* Converts our items into exported structures */
-+static void
-+convertItems (ParseContext *context, RecentFileItem **items, int *nItems)
-+{
-+ GSList *l;
-+ int i;
-+
-+ /* Count items with the OpenOffice.org group */
-+
-+ *nItems = 0;
-+ for (l = context->items; l; l = l->next) {
-+ Item *item;
-+
-+ item = l->data;
-+ if (hasGroup (item, GROUP_OPENOFFICE_ORG))
-+ (*nItems)++;
-+ }
-+
-+ if (*nItems == 0)
-+ return;
-+
-+ /* Add only the items we want */
-+
-+ *items = g_new (RecentFileItem, *nItems);
-+
-+ i = 0;
-+
-+ for (l = context->items; l; l = l->next) {
-+ Item *item;
-+
-+ item = l->data;
-+
-+ if (hasGroup (item, GROUP_OPENOFFICE_ORG)) {
-+ RecentFileItem *rfi;
-+
-+ rfi = (*items) + i;
-+
-+ rfi->uri = NULL;
-+ rtl_string2UString (&rfi->uri, item->uri, strlen (item->uri), RTL_TEXTENCODING_UTF8, 0);
-+ rfi->mimeType = NULL;
-+ rtl_string2UString (&rfi->mimeType, item->mimeType, strlen (item->mimeType), RTL_TEXTENCODING_UTF8, 0);
-+
-+ rfi->timestamp = item->timestamp;
-+
-+ i++;
-+ }
-+ }
-+}
-+
-+/* Opens ~/.recent-files and locks it. If something fails, returns NULL. */
-+static FILE *
-+openAndLock (void)
-+{
-+ char *filename;
-+ FILE *file;
-+ int fd;
-+ ParseContext context;
-+
-+ filename = getRecentFilename ();
-+
-+ file = fopen (filename, "r+");
-+ g_free (filename);
-+
-+ if (!file)
-+ return NULL;
-+
-+ fd = fileno (file);
-+ if (lockf (fd, F_LOCK, 0) != 0) {
-+ fclose (file);
-+ return NULL;
-+ }
-+
-+ return file;
-+}
-+
-+/* Unlocks ~/.recent-files and closes it. */
-+static void
-+unlockAndClose (FILE *file)
-+{
-+ int fd;
-+
-+ fd = fileno (file);
-+ lockf (fd, F_ULOCK, 0);
-+ fclose (file);
-+}
-+
-+
-+/**
-+ * recentFilesGetList:
-+ * @items: Return value; pointer to an array of items. Should be freed with recentFilesFree().
-+ * @nItems: Return value; number of items returned.
-+ *
-+ * Queries the list of GNOME recent file items.
-+ **/
-+void
-+recentFilesGetList (RecentFileItem **items, int *nItems)
-+{
-+ FILE *file;
-+ ParseContext context;
-+
-+ *items = NULL;
-+ *nItems = 0;
-+
-+ file = openAndLock ();
-+ if (!file)
-+ return;
-+
-+ parse (file, &context);
-+
-+ unlockAndClose (file);
-+
-+ convertItems (&context, items, nItems);
-+ freeContext (&context);
-+}
-+
-+/* Writes the ~/.recent-files file */
-+static void
-+writeXml (FILE *file, ParseContext *context)
-+{
-+ GSList *l;
-+
-+ fputs ("<?xml version=\"1.0\"?>\n"
-+ "<" TAG_RECENT_FILES ">\n",
-+ file);
-+
-+ for (l = context->items; l; l = l->next) {
-+ Item *item;
-+ GSList *gl;
-+
-+ item = l->data;
-+
-+ fputs (" <" TAG_RECENT_ITEM ">\n", file);
-+ fprintf (file,
-+ " <" TAG_URI ">%s</" TAG_URI ">\n"
-+ " <" TAG_MIME_TYPE ">%s</" TAG_MIME_TYPE ">\n"
-+ " <" TAG_TIMESTAMP ">%ld</" TAG_TIMESTAMP ">\n"
-+ "%s"
-+ " <" TAG_GROUPS ">\n",
-+ item->uri,
-+ item->mimeType,
-+ (long) item->timestamp,
-+ item->isPrivate ? " <" TAG_PRIVATE "/>\n" : "");
-+
-+ for (gl = item->groups; gl; gl = gl->next) {
-+ const char *group;
-+
-+ group = gl->data;
-+ fprintf (file,
-+ " <" TAG_GROUP ">%s</" TAG_GROUP ">\n",
-+ group);
-+ }
-+
-+ fputs (" </" TAG_GROUPS ">\n"
-+ " </" TAG_RECENT_ITEM ">\n",
-+ file);
-+ }
-+
-+ fputs ("</" TAG_RECENT_FILES ">\n", file);
-+}
-+
-+/**
-+ * recentFilesFree:
-+ * @items: Array of items.
-+ * @nItems: Number of items in the array.
-+ *
-+ * Frees an array of #RecentFileItem structures as returned by recentFilesGetList().
-+ **/
-+void
-+recentFilesFree (RecentFileItem *items, int nItems)
-+{
-+ int i;
-+
-+ for (i = 0; i < nItems; i++) {
-+ rtl_uString_release (items[i].uri);
-+ rtl_uString_release (items[i].mimeType);
-+ }
-+
-+ g_free (items);
-+}
-+
-+/**
-+ * recentFilesAddItem:
-+ * @uri: URI to add.
-+ * @mimeType: MIME type of the item.
-+ *
-+ * Adds an item to GNOME's recent files list. Automatically adds the "OpenOffice.org" group.
-+ **/
-+void
-+recentFilesAddItem (rtl_uString *uri, const rtl_uString *mimeType)
-+{
-+ FILE *file;
-+ ParseContext context;
-+ GSList *l;
-+ gboolean alreadyExists;
-+ int fd;
-+ rtl_String *uriString;
-+ rtl_String *mimeTypeString;
-+
-+ file = openAndLock ();
-+ if (!file)
-+ return;
-+
-+ parse (file, &context);
-+
-+ alreadyExists = FALSE;
-+
-+ uriString = NULL;
-+ mimeTypeString = NULL;
-+ rtl_uString2String (&uriString, uri->buffer, uri->length, RTL_TEXTENCODING_UTF8, 0);
-+ rtl_uString2String (&mimeTypeString, mimeType->buffer, mimeType->length, RTL_TEXTENCODING_UTF8, 0);
-+
-+ for (l = context.items; l; l = l->next) {
-+ Item *item;
-+
-+ item = l->data;
-+ if (strcmp (item->uri, uriString->buffer) == 0) {
-+ g_free (item->mimeType);
-+ item->mimeType = g_strdup (mimeTypeString->buffer);
-+ item->timestamp = time (NULL);
-+ alreadyExists = TRUE;
-+ break;
-+ }
-+ }
-+
-+ if (!alreadyExists) {
-+ Item *item;
-+
-+ item = g_new (Item, 1);
-+ item->uri = g_strdup (uriString->buffer);
-+ item->mimeType = g_strdup (mimeTypeString->buffer);
-+ item->timestamp = time (NULL);
-+ item->isPrivate = FALSE;
-+ item->groups = g_slist_prepend (NULL, g_strdup (GROUP_OPENOFFICE_ORG));
-+
-+ context.items = g_slist_prepend (context.items, item);
-+ }
-+
-+ rtl_string_release (uriString);
-+ rtl_string_release (mimeTypeString);
-+
-+ fd = fileno (file);
-+
-+ /* FIXME: perhaps we should do a write to a temporary file, then do an atomic rename() */
-+
-+ rewind (file);
-+ if (ftruncate (fd, 0) != 0)
-+ goto out;
-+
-+ writeXml (file, &context);
-+
-+out:
-+
-+ unlockAndClose (file);
-+ freeContext (&context);
-+}
-+
-+};
+++ /dev/null
-diff -Naur OOO_STABLE_1.orig/config_office/configure.in OOO_STABLE_1/config_office/configure.in
---- OOO_STABLE_1.orig/config_office/configure.in Wed Apr 24 20:54:58 2002
-+++ OOO_STABLE_1/config_office/configure.in Wed Apr 24 20:55:18 2002
-@@ -1073,23 +1073,23 @@
- dnl Test for the presence of the required gpc.{c,h} files
- dnl ===================================================================
-
--AC_MSG_CHECKING([GPC files])
--if test -f ../external/gpc/gpc.h; then
-- HAVE_GPC_H="yes"
--else
-- HAVE_GPC_H="no"
--fi
--if test -f ../external/gpc/gpc.c; then
-- HAVE_GPC_C="yes"
--else
-- HAVE_GPC_C="no"
--fi
-+dnl AC_MSG_CHECKING([GPC files])
-+dnl if test -f ../external/gpc/gpc.h; then
-+dnl HAVE_GPC_H="yes"
-+dnl else
-+dnl HAVE_GPC_H="no"
-+dnl fi
-+dnl if test -f ../external/gpc/gpc.c; then
-+dnl HAVE_GPC_C="yes"
-+dnl else
-+dnl HAVE_GPC_C="no"
-+dnl fi
-
--if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
-- AC_MSG_RESULT([GPC files found])
--else
-- AC_MSG_ERROR([GPC files not found])
--fi
-+dnl if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
-+dnl AC_MSG_RESULT([GPC files found])
-+dnl else
-+dnl AC_MSG_ERROR([GPC files not found])
-+dnl fi
-
- dnl ===================================================================
- dnl Setting up the environment.
-diff -Naur OOO_STABLE_1.orig/external/prj/build.lst OOO_STABLE_1/external/prj/build.lst
---- OOO_STABLE_1.orig/external/prj/build.lst Fri Jan 11 19:47:18 2002
-+++ OOO_STABLE_1/external/prj/build.lst Wed Apr 24 20:50:33 2002
-@@ -4,7 +4,5 @@
- es external\atl nmake - w es_atl NULL
- es external\glibc nmake - all es_glibc NULL
- es external\glibc\rtufiles nmake - all es_glibcrtu es_glibc NULL
--es external\gpc nmake - u es_gpc NULL
--es external\gpc nmake - w es_gpc NULL
- es external\w4w nmake - u es_w4w NULL
- es external\gcc3_specific nmake - u es_gcc3spec NULL
-diff -Naur OOO_STABLE_1.orig/external/prj/d.lst OOO_STABLE_1/external/prj/d.lst
---- OOO_STABLE_1.orig/external/prj/d.lst Tue Jun 26 15:07:02 2001
-+++ OOO_STABLE_1/external/prj/d.lst Wed Apr 24 20:55:24 2002
-@@ -7,7 +7,6 @@
- mkdir: %_DEST%\inc%_EXT%\external\freetype\config
- mkdir: %_DEST%\inc%_EXT%\external\freetype\internal
- mkdir: %_DEST%\inc%_EXT%\external\glibc
--mkdir: %_DEST%\inc%_EXT%\external\gpc
- mkdir: %_DEST%\inc%_EXT%\external\jpeg
- mkdir: %_DEST%\inc%_EXT%\external\npsdk
- mkdir: %_DEST%\inc%_EXT%\external\odbc
-diff -Naur OOO_STABLE_1.orig/gpc.diff OOO_STABLE_1/gpc.diff
-diff -Naur OOO_STABLE_1.orig/solenv/inc/libs.mk OOO_STABLE_1/solenv/inc/libs.mk
---- OOO_STABLE_1.orig/solenv/inc/libs.mk Fri Oct 26 17:14:41 2001
-+++ OOO_STABLE_1/solenv/inc/libs.mk Wed Apr 24 20:50:33 2002
-@@ -73,7 +73,7 @@
- #
-
- ICUI18NLIB=-licui18n -licuuc -licule -licudata
--GPC3RDLIB=-lgpc
-+GPC3RDLIB=-lgpcl
- SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
- XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)
- COMPHELPERLIB=-lcomphelp2
+++ /dev/null
---- ridljar/util/makefile.mk.orig 2003-08-10 13:12:20.000000000 -0700
-+++ ridljar/util/makefile.mk 2003-08-10 13:12:36.000000000 -0700
-@@ -84,10 +84,12 @@
- ZIP1DIR=$(PRJ)
- ZIP1LIST=com -x "*makefile.mk"
-
-+.IF "$(SOLAR_JAVA)"!=""
- ZIP2TARGET=$(TARGET)2_src
- ZIP2FLAGS=-u -r
- ZIP2DIR=$(MISC)$/java
- ZIP2LIST=com
-+.ENDIF
-
- # --- Targets ------------------------------------------------------
-
+++ /dev/null
-[ENVIRONMENT]
-INSTALLATIONMODE=INSTALL_WORKSTATION
-INSTALLATIONTYPE=WORKSTATION
-DESTINATIONPATH=<home>/.openoffice
-OUTERPATH=
-LOGFILE=
-LANGUAGELIST=01
-
-[JAVA]
-JavaSupport=none
-
+++ /dev/null
-[ENVIRONMENT]
-INSTALLATIONMODE=INSTALL_NETWORK
-INSTALLATIONTYPE=SPECIFY
-DESTINATIONPATH=@DESTDIR@
-OUTERPATH=
-LOGFILE=@LOGFILE@
-LAGUAGELIST=01
-
-[JAVA]
-JavaSupport=preinstalled_or_none
+++ /dev/null
---- oo/sc/source/core/tool/compiler.cxx.orig Sat May 24 08:13:49 2003
-+++ oo/sc/source/core/tool/compiler.cxx Sat May 24 08:14:21 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -2989,7 +2989,7 @@
- for( ScToken* t = pArr->GetNextReference(); t;
- t = pArr->GetNextReference() )
- {
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
-@@ -3029,7 +3029,7 @@
- // Absolute references have been already adjusted in the named
- // shared formula itself prior to breaking the shared formula
- // and calling this function. Don't readjust them again.
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
---- oo/sc/source/core/tool/rangenam.cxx.orig Sat May 24 08:17:30 2003
-+++ oo/sc/source/core/tool/rangenam.cxx Sat May 24 08:17:55 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -390,7 +390,7 @@
- {
- if( t->GetType() != svIndex )
- {
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
-@@ -420,7 +420,7 @@
- {
- if( t->GetType() != svIndex )
- {
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
---- oo/sc/source/core/data/cell2.cxx.orig Sat May 24 08:59:18 2003
-+++ oo/sc/source/core/data/cell2.cxx Sat May 24 08:59:38 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -1198,7 +1198,7 @@
- t->CalcAbsIfRel( aOldPos );
- BOOL bMod;
- { // own scope for SingleDoubleRefModifier dtor if SingleRef
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
-@@ -1227,7 +1227,7 @@
- t->CalcAbsIfRel( aOldPos );
- BOOL bMod;
- { // own scope for SingleDoubleRefModifier dtor if SingleRef
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
-@@ -1286,7 +1286,7 @@
- t->CalcAbsIfRel( aPos );
- BOOL bMod;
- { // own scope for SingleDoubleRefModifier dtor if SingleRef
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
-@@ -1315,7 +1315,7 @@
- t->CalcAbsIfRel( aPos );
- BOOL bMod;
- { // own scope for SingleDoubleRefModifier dtor if SingleRef
-- SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
-+ const SingleDoubleRefModifier& rMod = (t->GetType() == svSingleRef ?
- SingleDoubleRefModifier( t->GetSingleRef() ) :
- SingleDoubleRefModifier( t->GetDoubleRef() ));
- ComplRefData& rRef = rMod.Ref();
+++ /dev/null
-#!/usr/bin/perl -w
-
-# Newer ImageMagick's don't like some of the
-# broken icons OO.o contains.
-$lc_good = 'res/lc00000.bmp';
-$sc_good = 'res/sc00000.bmp';
-
-# beautiful hard-coding action.
-@scale_dirs = (
- 'res',
- 'sc/res/imglst/apptbx',
- 'sc/res/imglst/navipi',
- 'sd/res/imagelst',
- 'sd/res/imagelst/korean',
- 'sw/win/imglst',
- 'sw/win/imglst/korean',
- 'sch/res',
- 'offmgr/res',
- 'res/enus',
- 'dbaccess/res',
- 'sc/res',
- 'sd/res',
- 'sw/win/res',
- 'starmath/res',
- 'res/arab',
- 'res/catalan',
- 'res/chinsim',
- 'res/chintrad',
- 'res/czech',
- 'res/dtch',
- 'res/fren',
- 'res/hung',
- 'res/ital',
- 'res/japn',
- 'res/korean',
- 'res/pol',
- 'res/poln',
- 'res/port',
- 'res/portbr',
- 'res/russ',
- 'res/slovak',
- 'res/slovenian',
- 'res/span',
- 'res/turk'
- );
-
-%scale_exceptions = (
- 'sw/win/imglst' => '[sn][cr][0-9]*\.bmp',
- 'sc/res/imglst/navipi' => 'na0.*\.bmp',
- 'res' => '[si][cm][0-9]*\.bmp'
-);
-
-sub usage {
- printf "Usage: scale-icons </path/to/ooo_checkout> [--quiet] [--backupdir=</path/for/original_bmps>\n";
-}
-
-if (@ARGV < 1) {
- usage ();
- exit (1);
-}
-
-$OOO_PATH = shift (@ARGV);
-
-if ($OOO_PATH =~ m/--.*/) {
- usage ();
- exit (1);
-}
-
-$lc_good = "$OOO_PATH/$lc_good";
-$sc_good = "$OOO_PATH/$sc_good";
-
-$quiet = 0;
-$remove = 0;
-$backupdir = "";
-
-foreach $a (@ARGV) {
- if ($a eq '--quiet') {
- $quiet = 1;
- } elsif ($a eq '--remove') {
- $remove = 1;
- } elsif ($a =~ m/--backupdir=(.*)/) {
- $backupdir = $1;
- }
-}
-
-sub handle_scaled {
- my $relinstdir = shift;
- my $small_regex = shift;
- my $large_regex = shift;
- my ($dirhandle, $file);
- my $instdir = "$OOO_PATH/$relinstdir";
- my $STAMPNAME = "$instdir/ooo-convert-stamp";
-
- if (! -d $instdir) {
- print "skipping $instdir\n";
- next;
- }
-
- if ($remove) {
- -f $STAMPNAME || return;
- } else {
- -f $STAMPNAME && return;
- }
-
- print "Scaling: '$instdir'\n";
-
- opendir ($dirhandle, $instdir) || die "can't opendir $instdir: $!";
-
- while ($file = readdir ($dirhandle)) {
- if ($file =~ m/^$small_regex$|^$large_regex$/) {
- my $src = "$instdir/$file";
- my $dest = "$src.cnvt";
-
- if ($remove) {
- $quiet || print "Remove '$src'\n";
- unlink ($src);
- next;
- }
- $quiet || print "Convert '$src'\n";
-
- -f $src || die "Internal error";
-
- if ($src =~ /$small_regex/) {
- if (system ("convert -mattecolor '#c0c0c0' -frame 2x2 -crop 16x16+2+2 $src $dest") != 0) {
- print "*** Warning: convert failed; trying copy\n";
- system ("cp -f $sc_good $dest");
- }
- } elsif ($src =~ /$large_regex/) {
- if (system ("convert -mattecolor '#c0c0c0' -frame 2x2 -crop 24x24+3+2 $src $dest") != 0) {
- print "*** Warning: convert failed; trying copy\n";
- system ("cp -f $lc_good $dest");
- }
- }
- if (-f $dest) {
- print $backupdir ? "$backupdir/$relinstdir/$file" : "$src.orig", "\n";
- rename ($src,
- $backupdir ? "$backupdir/$relinstdir/$file" : "$src.orig");
- rename ($dest, $src);
- }
- }
- }
-
- closedir ($dirhandle);
-
- if ($remove) {
- unlink ("$STAMPNAME");
- } else {
- my $stamphandle;
- open ($stamphandle, ">$STAMPNAME") || die "Error stamping $STAMPNAME $!";
- print $stamphandle "Stamp\n";
- close ($stamphandle);
- }
-}
-
-for $a (@scale_dirs) {
- my $small_regex;
- if (defined ($scale_exceptions{$a})) {
- $small_regex = $scale_exceptions{$a};
- print "Exception on '$a' => '$small_regex'\n";
- } else {
- $small_regex = 'sc[0-9]*\.bmp';
- }
- if ($backupdir) {
- if (system ("mkdir -p $backupdir/$a\n") != 0) {
- print "*** Warning: could not create $backupdir/$a\n" ;
- $backupdir = "";
- }
- }
- handle_scaled ("$a", $small_regex, 'lc[0-9]*\.bmp');
-}
-
-print "Binning dupped icons\n";
--f "$OOO_PATH/extras/source/symbols/makefile.mk" || die "No dupped icon directory";
-if ($backupdir) {
- system ("mkdir -p $backupdir/extras/source/symbols");
- system ("cp -a $OOO_PATH/extras/source/symbols/*.bmp $backupdir/extras/source/symbols");
-}
-system ("rm -f $OOO_PATH/extras/source/symbols/*.bmp");
-
-print "Completed cleanly.\n";
-exit (0);
+++ /dev/null
---- oo/sch/source/ui/unoidl/register.cxx.orig Sat May 24 05:22:38 2003
-+++ oo/sch/source/ui/unoidl/register.cxx Sat May 24 05:23:54 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -95,7 +95,7 @@
- RTL_CONSTASCII_USTRINGPARAM("/") ) + SchDocument_getImplementationName() +
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-- uno::Sequence< rtl::OUString > &rServices = SchDocument_getSupportedServiceNames();
-+ const uno::Sequence< rtl::OUString > &rServices = SchDocument_getSupportedServiceNames();
- for(i = 0; i < rServices.getLength(); i++ )
- xNewKey->createKey( rServices.getConstArray()[i]);
-
+++ /dev/null
---- scp/source/global/udk_base.scp.orig 2003-08-11 11:22:39.000000000 -0700
-+++ scp/source/global/udk_base.scp 2003-08-11 11:38:05.000000000 -0700
-@@ -342,6 +342,7 @@
- #endif
- End
-
-+#ifdef SOLAR_JAVA
- File gid_File_Lib_Jvmaccess
- TXT_FILE_BODY;
- Dir = GCFG_BINARY_DIR;
-@@ -368,3 +369,4 @@
- Styles = (NETWORK,RELATIVE);
- End
- #endif
-+#endif
---- scp/source/global/setupzip.scp.orig 2003-08-11 11:23:38.000000000 -0700
-+++ scp/source/global/setupzip.scp 2003-08-11 11:28:02.000000000 -0700
-@@ -393,8 +393,6 @@
-
- #if !defined(IPL_PRODUCT) && !defined(OPL_PRODUCT) || defined(UNX)
-
--#ifdef SOLAR_JAVA
--
- File GID_FILE_LIB_J
- TXT_FILE_BODY;
- #ifdef UNX
-@@ -408,8 +406,6 @@
-
- #endif
-
--#endif
--
- File GID_FILE_LIB_COMPHELPER2
- TXT_FILE_BODY;
- #ifdef UNX
-@@ -527,12 +523,14 @@
-
- #endif
-
-+#ifdef SOLAR_JAVA
- File GID_FILE_JAR_UNOIL
- TXT_FILE_BODY;
- Name = "unoil.jar";
- Dir = GCFG_CLASSES_DIR;
- Styles = (PACKED,DONT_OVERWRITE,SETUPZIP);
- End
-+#endif
-
- #ifdef INCLUDE_JAVA_ACCESSBRIDGE
-
-@@ -546,14 +544,14 @@
- #endif
-
- #ifdef UNX
--
-+#ifdef SOLAR_JAVA
- File GID_FILE_BIN_JAVALDX
- BIN_FILE_BODY;
- Dir = GCFG_BINARY_DIR;
- Styles = (PACKED, SETUPZIP);
- Name = EXENAME(javaldx);
- End
--
-+#endif
- #endif
-
- #ifdef UNX
---- scp/source/global/udk_complete.scp.orig 2003-08-11 11:28:16.000000000 -0700
-+++ scp/source/global/udk_complete.scp 2003-08-11 11:29:30.000000000 -0700
-@@ -75,6 +75,7 @@
- #endif
- End
-
-+#ifdef SOLAR_JAVA
- #ifndef MACOSX
- File gid_File_Lib_OfficeBean
- TXT_FILE_BODY;
-@@ -94,6 +95,8 @@
- Styles = (PACKED);
- End
- #endif
-+#endif
-+
- /*
- File gid_File_Lib_Stm
- TXT_FILE_BODY;
---- scp/source/office/files.scp.orig 2003-08-11 11:29:45.000000000 -0700
-+++ scp/source/office/files.scp 2003-08-11 11:30:15.000000000 -0700
-@@ -715,6 +715,7 @@
-
- #endif
-
-+#ifdef SOLAR_JAVA
- File GID_FILE_LIB_JDBC_2
- TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
-@@ -726,6 +727,7 @@
- Name = "jdbc2.dll";
- #endif
- End
-+#endif
-
- File GID_FILE_LIB_ODBC_2
- TXT_FILE_BODY;
---- scp/util/makefile.mk.orig 2003-08-11 11:30:57.000000000 -0700
-+++ scp/util/makefile.mk 2003-08-11 11:34:00.000000000 -0700
-@@ -88,7 +88,6 @@
- module_math.par \
- module_grafik.par \
- module_lingu.par \
-- module_javafilter.par \
- profile.par \
- profile_calc.par \
- profile_impress.par \
-@@ -96,13 +95,10 @@
- profile_math.par \
- profile_chart.par \
- profile_grafik.par \
-- profile_javafilter.par \
- setupzip.par \
- readme.par \
- udk_base.par \
- udk_bridges.par \
-- udk_java.par \
-- udk_pure_java.par \
- udk_remote.par \
- udk_complete.par \
- files.par \
-@@ -113,10 +109,15 @@
- files_chart.par \
- files_grafik.par \
- files_lingu.par \
-- files_javafilter.par \
- dir.par \
- python.par
--
-+.IF "$(SOLAR_JAVA)"!=""
-+SCP1FILES += module_javafilter.par \
-+ profile_javafilter.par \
-+ files_javafilter.par \
-+ udk_java.par \
-+ udk_pure_java.par
-+.ENDIF
-
- #python.par
-
+++ /dev/null
---- oo_1.1_src/scptools/source/linker/scpzip.cxx.jj 2001-12-05 08:12:02.000000000 -0500
-+++ oo_1.1_src/scptools/source/linker/scpzip.cxx 2003-02-05 09:31:36.000000000 -0500
-@@ -363,6 +363,7 @@ void ZipFile( SiFile* pFile, USHORT nLan
- if( pFile->IsArchive() || pFile->IsPacked() )
- {
- ByteString aPackedname;
-+ BOOL makeLink;
- if( bOldSetupZIPStyle && pFile->IsSetupZip() )
- aPackedname = "f_0000";
- else
-@@ -385,7 +386,33 @@ void ZipFile( SiFile* pFile, USHORT nLan
- if( !pFile->IsSetupZip() && aDestination.Exists() )
- aDestination.Kill();
-
-- if( pFile->IsArchive() )
-+ makeLink = TRUE;
-+ if( nLang == 1 )
-+ makeLink = FALSE;
-+ else
-+ {
-+ const char *p, *q;
-+
-+ p = pFile->GetID().GetBuffer();
-+ q = strchr (p, '\0');
-+ if (q > p + 5 && strcmp (q - 5, "_Lang") == 0)
-+ makeLink = FALSE;
-+ else
-+ {
-+ p = pFile->GetName().GetBuffer();
-+ q = strchr (p, '\0');
-+ if (q > p + 4 && strcmp (q - 4, ".res") == 0)
-+ makeLink = FALSE;
-+ }
-+ }
-+ if ( makeLink )
-+ {
-+ ByteString linkName = "../../01/normal/";
-+
-+ linkName += aPackedname;
-+ symlink (linkName.GetBuffer(), aDestination.GetFull().GetBuffer());
-+ }
-+ else if( pFile->IsArchive() )
- {
- SiDirEntry aEntry(aSource);
- FileCopier aCpy( aEntry, aDestination );
+++ /dev/null
-#!/bin/awk -f
-/^File /{flag=1;name=$2;}
-/^Directory /{flag=2;name=$2;}
-/^End/{flag=0;name="";}
-
-(flag==1)&&/[ \t]Name[ \t]/{
- gsub(/[\"; \t]/,"");
- split($0,TAB,"=");
- gsub(/Name/,"",TAB[1]);
- if (TAB[1]=="")TAB[1]="01";
- gsub(/[\(\)]/,"",TAB[1]);
- files_name[TAB[1],name]=TAB[2];
-};
-
-(flag==1)&&/[ \t]PackedName[ \t]/{
- gsub(/[\"; \t]/,"");
- split($0,TAB,"=");
- gsub(/PackedName/,"",TAB[1]);
- if (TAB[1]=="")TAB[1]="01";
- gsub(/[\(\)]/,"",TAB[1]);
- files_packedname[TAB[1],name]=TAB[2];
-};
-
-(flag==1)&&/[ \t]Dir[ \t]/{
- gsub(/[\"; \t]/,"");
- split($0,TAB,"=");
- gsub(/Dir/,"",TAB[1]);
- if (TAB[1]=="")TAB[1]="01";
- gsub(/[\(\)]/,"",TAB[1]);
- files_dir[TAB[1],name]=TAB[2];
-};
-
-(flag==2)&&/[ \t]ParentID[ \t]/{
- gsub(/[\"; \t]/,"");
- split($0,TAB,"=");
- dirs_parent[name]=TAB[2];
-}
-
-(flag==2)&&/[ \t]HostName[ \t]/{
- gsub(/[\"; \t]/,"");
- split($0,TAB,"=");
- dirs_hostname[name]=TAB[2];
-}
-
-END{
-#exit;
- for (arg in ARGV){
- split(ARGV[arg],TAB,"=");
- param[TAB[1]]=TAB[2];
- }
- for (f in files_packedname){
- f2=f;
- gsub(/[0-9][0-9]/,"",f2);
- lang=substr(f,1,2);
- dir=files_dir["01"f2];
-# print lang;
-# print files_name[f];
-# print files_packedname[f];
-# print files_dir["01"f2];
-
- path="";
-# p1=dirs_parent[lang,dir];
- p1=dir;
- while (p1!=""){
- p2=p1;
- path=dirs_hostname[p1] "/" path;
- p1=dirs_parent[p1]
- }
- if (p2=="PREDEFINED_PROGDIR"){
- path=param["DIRTO"] path;
- file=param["DIRFROM"] lang "/normal/" files_packedname[f];
- cmd="unzip -d "path" -o "file;
- system("mkdir -p "path);
- system(cmd);
-# print cmd;
-# print p2,path;
- }
- else if (p2=="PREDEFINED_HOMEDIR"){
- }
- else if (p2=="PREDEFINED_NS6PLUGINDIR"){
- }
- else if (p2=="PREDEFINED_NSPLUGINDIR"){
- }
-
-# exit;
-
-# print path,dir;
-# print dirs_parent[lang,dir];
-# print "===";
- }
-
-}
+++ /dev/null
---- oo_1.0.1_src/setup2/inc/main.hxx.setup-localized-instdb 2002-05-31 12:05:00.000000000 +0200
-+++ oo_1.0.1_src/setup2/inc/main.hxx 2002-09-03 14:19:40.000000000 +0200
-@@ -165,6 +165,7 @@ private:
- ByteString m_aParamDestPath;
- ByteString m_aParamFollowApp;
- ByteString m_SetupIniSourcePath;
-+ ByteString m_aInstDBLanguageSuffix;
- int m_nLanguage;
- USHORT m_nWorkStationCnt;
- USHORT m_nWorkStationIdx;
---- oo_1.0.1_src/setup2/source/ui/main.cxx.setup-localized-instdb 2002-07-15 01:20:24.000000000 +0200
-+++ oo_1.0.1_src/setup2/source/ui/main.cxx 2002-09-03 15:12:15.000000000 +0200
-@@ -1294,6 +1294,13 @@ UniString SetupApp::ReadParams()
- }
- else
- //////////////////////////////////////
-+ // LANG:(instdb.ins language suffix)
-+ if( aParamPrefix == "LANG:" )
-+ {
-+ m_aInstDBLanguageSuffix = aParamPostfix;
-+ }
-+ else
-+ //////////////////////////////////////
- // SDUMP
- if( aParamName == "SDUMP" )
- {
-@@ -1401,6 +1408,12 @@ BOOL SetupApp::FindAndReadScript()
- BOOL bWorkstation = FALSE;
-
- ByteString aScriptName( SETUP_INSTDB_FILE );
-+ if ( m_aInstDBLanguageSuffix.Len() )
-+ {
-+ aScriptName += ".";
-+ aScriptName += m_aInstDBLanguageSuffix;
-+ }
-+
- SiDirEntry aScript (m_pEnv->GetStartPath());
- aScript += aScriptName;
-
-@@ -1410,6 +1423,20 @@ BOOL SetupApp::FindAndReadScript()
- aScript += aScriptName;
- }
-
-+ // Fallback to default script
-+ if( !aScript.Exists() && m_aInstDBLanguageSuffix.Len() )
-+ {
-+ aScriptName.Assign( SETUP_INSTDB_FILE );
-+ aScript = SiDirEntry( m_pEnv->GetStartPath() );
-+ aScript += aScriptName;
-+
-+ while( (!aScript.Exists()) && (aScript.Level() > 2) )
-+ {
-+ aScript = aScript[2];
-+ aScript += aScriptName;
-+ }
-+ }
-+
- if( aScript.Exists() )
- {
- m_pEnv->SetFirstInstallation(FALSE);
+++ /dev/null
---- setup2/source/custom/jvmsetup/loader/makefile.mk.orig 2003-09-22 11:08:19.000000000 -0700
-+++ setup2/source/custom/jvmsetup/loader/makefile.mk 2003-09-22 13:28:10.000000000 -0700
-@@ -72,6 +72,9 @@
- .INCLUDE : sv.mk
-
- # --- Files --------------------------------------------------------
-+
-+.IF "$(SOLAR_JAVA)"!=""
-+
- CXXFILES= jvmapp.cxx
-
- OBJFILES= $(OBJ)$/jvmapp.obj
-@@ -128,6 +131,8 @@
- UNIXTEXT= \
- $(MISC)$/jvmsetup.sh
-
-+.ENDIF "$(SOLAR_JAVA)"!=""
-+
- .INCLUDE : target.mk
-
- # ------------------------------------------------------------------
---- setup2/source/custom/jvmsetup/makefile.mk.orig 2003-09-22 11:08:19.000000000 -0700
-+++ setup2/source/custom/jvmsetup/makefile.mk 2003-09-22 13:31:00.000000000 -0700
-@@ -73,6 +73,8 @@
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)"!=""
-+
- .DIRCACHE=NO
-
- SRCFILES = jvmdlg.src
-@@ -113,6 +115,8 @@
-
- RC_SUBDIRSDEPS=$(SLB)$/jvm.lib
-
-+.ENDIF # "$(SOLAR_JAVA)"!=""
-+
- # --- Targets --------------------------------------------------------------
-
- .INCLUDE : target.mk
---- setup2/source/ui/main.cxx.orig 2003-09-22 11:08:19.000000000 -0700
-+++ setup2/source/ui/main.cxx 2003-09-22 13:27:05.000000000 -0700
-@@ -78,7 +78,9 @@
- #include <sal/main.h>
- #endif
-
-+#ifdef SOLAR_JAVA
- #include "jvmaccess/javainfo.hxx"
-+#endif
-
- #ifndef _SV_HELP_HXX //autogen
- #include <vcl/help.hxx>
-@@ -2523,6 +2525,7 @@
- static sal_Bool hasJavarc();
- void prepareJava(const char * szStartPath)
- {
-+#ifdef SOLAR_JAVA
- if(szStartPath)
- {
- //check if we are started from an installation. This is done by looking for the classes
-@@ -2656,6 +2659,7 @@
- #endif
- }
- }
-+#endif // SOLAR_JAVA
- }
-
- static sal_Bool hasJavarc()
---- setup2/util/makefile.mk.orig 2003-09-22 11:08:19.000000000 -0700
-+++ setup2/util/makefile.mk 2003-09-22 13:27:05.000000000 -0700
-@@ -186,7 +186,6 @@
- $(SVTOOLLIB) \
- $(VCLLIB) \
- $(TOOLSLIB) \
-- $(JVMACCESSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
-@@ -195,7 +194,10 @@
- $(SALHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(SALLIB)
--
-+.IF "$(SOLAR_JAVA)"!=""
-+APP2STDLIBS+=\
-+ $(JVMACCESSLIB)
-+.ENDIF
-
- .IF "$(GUI)"=="WNT"
- APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
+++ /dev/null
---- sj2/source/java/jnihelp.cxx.orig 2003-08-08 20:54:39.000000000 -0700
-+++ sj2/source/java/jnihelp.cxx 2003-08-08 20:55:41.000000000 -0700
-@@ -59,6 +59,7 @@
- *
- ************************************************************************/
-
-+#ifdef SOLAR_JAVA
- #include <cstdarg>
- #include <tools/debug.hxx>
- #include <jni.h> /* where everything is defined */
-@@ -99,3 +100,5 @@
- _xJavaThreadRegister_11->revokeThread();
- }
- }
-+
-+#endif // SOLAR_JAVA
---- sj2/source/jscpp/sjapplet.cxx.orig 2003-08-08 20:58:19.000000000 -0700
-+++ sj2/source/jscpp/sjapplet.cxx 2003-08-08 21:01:41.000000000 -0700
-@@ -60,7 +60,9 @@
- ************************************************************************/
-
- #include <cstdarg>
-+#ifdef SOLAR_JAVA
- #include <jnihelp.hxx>
-+#endif // SOLAR_JAVA
-
- #include <sjapplet.hxx>
-
-@@ -79,11 +81,15 @@
-
- using namespace ::rtl;
- using namespace ::utl;
-+#ifdef SOLAR_JAVA
- using namespace ::sj2;
-+#endif // SOLAR_JAVA
-
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::uno;
-+#ifdef SOLAR_JAVA
- using namespace ::com::sun::star::java;
-+#endif // SOLAR_JAVA
-
- SjApplet2::SjApplet2()
- : _pImpl(new SjApplet2_Impl())
-@@ -346,7 +352,7 @@
- /*
- * Java init function to invoke Java runtime using JNI invocation API.
- */
--
-+#ifdef SOLAR_JAVA
- void JRE_PropertyChanged( JNIEnv * env, const SvCommandList & rCmdList )
- {
- jclass pClass = env->FindClass("java/util/Properties");
-@@ -389,6 +395,7 @@
- env->DeleteLocalRef( pProps );
- env->DeleteLocalRef( pClass );
- }
-+#endif // SOLAR_JAVA
-
- // Settings are detected by the JavaVM service
- // This function is not necessary anymore
---- sj2/source/jscpp/sjapplet_impl.cxx.orig 2003-08-08 21:06:04.000000000 -0700
-+++ sj2/source/jscpp/sjapplet_impl.cxx 2003-08-08 21:24:29.000000000 -0700
-@@ -78,18 +78,24 @@
- #include <vcl/syschild.hxx>
- #include <vcl/sysdata.hxx>
-
-+#ifdef SOLAR_JAVA
- #include <jnihelp.hxx>
-+#endif // SOLAR_JAVA
-
- using namespace ::rtl;
- using namespace ::osl;
-+#ifdef SOLAR_JAVA
- using namespace ::sj2;
-+#endif // SOLAR_JAVA
- using namespace ::utl;
-
-+#ifdef SOLAR_JAVA
- using namespace ::com::sun::star::java;
-+#endif // SOLAR_JAVA
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::uno;
-
--
-+#ifdef SOLAR_JAVA
- static void testJavaException(JNIEnv * pEnv) throw(com::sun::star::uno::RuntimeException)
- {
- jthrowable jtThrowable = pEnv->ExceptionOccurred();
-@@ -114,7 +120,14 @@
- throw RuntimeException(ouMessage, Reference<XInterface>());
- }
- }
-+#else // !SOLAR_JAVA
-+static void throwException() throw(com::sun::star::uno::RuntimeException)
-+{
-+ throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("Java applets not supported.")), Reference<XInterface>());
-+}
-+#endif
-
-+#ifdef SOLAR_JAVA
- #ifdef UNX
- struct EmbeddedWindow {
- jobject _joWindow;
-@@ -210,17 +223,22 @@
-
- _joWindow = 0;
- }
-+#endif // SOLAR_JAVA
-
--
--
-+#ifdef SOLAR_JAVA
- SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException)
- : _pJVM(NULL),
- _joAppletExecutionContext(0),
- _jcAppletExecutionContext(0)
-
- {}
-+#else // !SOLAR_JAVA
-+SjApplet2_Impl::SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException)
-+{}
-+#endif
-
- SjApplet2_Impl::~SjApplet2_Impl() throw() {
-+#ifdef SOLAR_JAVA
- if (_joAppletExecutionContext) {
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
-@@ -230,6 +248,7 @@
- jenv.pEnv->DeleteGlobalRef(_joAppletExecutionContext);
- jenv.pEnv->DeleteGlobalRef(_jcAppletExecutionContext);
- }
-+#endif
- }
-
- void SjApplet2_Impl::init(Window * pParentWin,
-@@ -238,6 +257,7 @@
- const SvCommandList & rCmdList)
- throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- _pParentWin = pParentWin;
-
-
-@@ -338,11 +358,14 @@
- joDocBase, joParameters, _pEmbeddedWindow->_joWindow, (jlong)0); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_init); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_startUp); testJavaException(jenv.pEnv);
--
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
- void SjApplet2_Impl::setSize(const Size & rSize) throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
- _pParentWin->SetSizePixel(rSize);
-@@ -350,42 +373,62 @@
- jmethodID jmAppletExecutionContext_resize = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "appletResize", "(II)V"); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_resize, (jint)rSize.Width(),
- (jint)rSize.Height()); testJavaException(jenv.pEnv);
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
- void SjApplet2_Impl::restart() throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
- jmethodID jmAppletExecutionContext_restart = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "restart", "()V"); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_restart); testJavaException(jenv.pEnv);
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
- void SjApplet2_Impl::reload() throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
- jmethodID jmAppletExecutionContext_reload = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "reload", "()V"); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_reload); testJavaException(jenv.pEnv);
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
- void SjApplet2_Impl::start() throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
- jmethodID jmAppletExecutionContext_sendStart = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "sendStart", "()V"); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_sendStart); testJavaException(jenv.pEnv);
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
- void SjApplet2_Impl::stop() throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
- jmethodID jmAppletExecutionContext_sendStop = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "sendStop", "()V"); testJavaException(jenv.pEnv);
- jenv.pEnv->CallVoidMethod(_joAppletExecutionContext, jmAppletExecutionContext_sendStop); testJavaException(jenv.pEnv);
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
- void SjApplet2_Impl::close() throw(com::sun::star::uno::RuntimeException)
- {
-+#ifdef SOLAR_JAVA
- TKTThreadAttach jenv(_pJVM, _xJavaThreadRegister_11.get());
-
- jmethodID jmAppletExecutionContext_shutdown = jenv.pEnv->GetMethodID(_jcAppletExecutionContext, "shutdown", "()V"); testJavaException(jenv.pEnv);
-@@ -416,5 +459,8 @@
- }
- }
- }
-+#else // !SOLAR_JAVA
-+ throwException();
-+#endif
- }
-
---- sj2/source/jscpp/sjapplet_impl.hxx.orig 2003-08-08 21:24:48.000000000 -0700
-+++ sj2/source/jscpp/sjapplet_impl.hxx 2003-08-08 21:35:45.000000000 -0700
-@@ -1,13 +1,15 @@
- #include <cstdarg>
-
--
-+#ifdef SOLAR_JAVA
- #include <jni.h>
--
-+#endif // SOLAR_JAVA
-
- #include <unotools/processfactory.hxx>
-
-+#ifdef SOLAR_JAVA
- #include <com/sun/star/java/XJavaVM.hpp>
- #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
-+#endif // SOLAR_JAVA
-
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-@@ -16,9 +18,12 @@
- class SvCommandList;
- class Size;
-
-+#ifdef SOLAR_JAVA
- struct EmbeddedWindow;
-+#endif // SOLAR_JAVA
-
- struct SjApplet2_Impl {
-+#ifdef SOLAR_JAVA
- Window * _pParentWin;
-
- JavaVM * _pJVM;
-@@ -29,6 +34,7 @@
-
- com::sun::star::uno::Reference<com::sun::star::java::XJavaVM> _xJavaVM;
- com::sun::star::uno::Reference<com::sun::star::java::XJavaThreadRegister_11> _xJavaThreadRegister_11;
-+#endif // SOLAR_JAVA
-
- SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException);
- ~SjApplet2_Impl() throw();
+++ /dev/null
---- oo_1.0.1_src/sj2/stardiv/applet/DocumentProxy.java.old Mon Sep 18 18:54:03 2000
-+++ oo_1.0.1_src/sj2/stardiv/applet/DocumentProxy.java Fri Nov 1 21:34:29 2002
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -73,6 +73,8 @@
- import java.util.Hashtable;
- import java.util.Observer;
- import java.util.Observable;
-+import java.util.Iterator;
-+import java.io.InputStream;
-
- import java.net.URL;
-
-@@ -96,6 +98,22 @@
- return documentProxy;
- }
-
-+ // AppletContext. This method is new since 1.4. We insert it so as to
-+ // have the project buildable
-+ public void setStream( String key,InputStream stream)
-+ throws java.io.IOException {
-+ }
-+ // AppletContext. This method is new since 1.4. We insert it so as to
-+ // have the project buildable
-+ public InputStream getStream( String key) {
-+ return null;
-+ }
-+ // AppletContext. This method is new since 1.4. We insert it so as to
-+ // have the project buildable
-+ public Iterator getStreamKeys() {
-+ return null;
-+ }
-+
-
- /*
- ** interface cachable methods
---- oo_1.0.1_src/sj2/stardiv/applet/AppletViewer.java.old Mon Sep 18 18:54:03 2000
-+++ oo_1.0.1_src/sj2/stardiv/app/AppletViewer.java Fri Nov 1 21:46:41 2002
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -196,7 +196,8 @@
- public AppletViewer(int x, int y, URL doc, Hashtable atts, PrintStream statusMsgStream) {
- // resourceViewer = new stardiv.util.ResourceViewer();
- // resourceViewer.show();
-- System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
-+ //sun.awt.ScreenUpdater does not exist in Java 1.4
-+// System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
- this.statusMsgStream = statusMsgStream;
- this.atts = atts;
-
+++ /dev/null
---- solenv/inc/unxlngi3.mk.orig 2003-04-28 09:46:48.000000000 -0700
-+++ solenv/inc/unxlngi3.mk 2003-08-18 22:09:12.000000000 -0700
-@@ -64,7 +64,7 @@
- ASM=
- AFLAGS=
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngi4.mk.orig 2003-07-31 01:32:41.000000000 -0700
-+++ solenv/inc/unxlngi4.mk 2003-08-18 22:09:12.000000000 -0700
-@@ -64,7 +64,7 @@
- ASM=
- AFLAGS=
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngi5.mk.orig 2003-07-31 01:32:41.000000000 -0700
-+++ solenv/inc/unxlngi5.mk 2003-08-18 22:09:12.000000000 -0700
-@@ -64,7 +64,7 @@
- ASM=
- AFLAGS=
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngppc.mk.orig 2003-04-28 09:47:14.000000000 -0700
-+++ solenv/inc/unxlngppc.mk 2003-08-18 22:09:12.000000000 -0700
-@@ -65,7 +65,7 @@
- ASM=
- AFLAGS=
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngppc4.mk.orig 2003-06-12 03:02:32.000000000 -0700
-+++ solenv/inc/unxlngppc4.mk 2003-08-18 22:09:12.000000000 -0700
-@@ -64,7 +64,7 @@
- ASM=
- AFLAGS=
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
---- solenv/inc/unxlngs3904.mk.orig 2003-06-12 03:02:43.000000000 -0700
-+++ solenv/inc/unxlngs3904.mk 2003-08-18 22:09:12.000000000 -0700
-@@ -64,7 +64,7 @@
- ASM=
- AFLAGS=
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA*=TRUE
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
+++ /dev/null
---- oo/solenv/inc/tg_compv.mk.orig Fri May 23 15:35:24 2003
-+++ oo/solenv/inc/tg_compv.mk Fri May 23 15:30:39 2003
-@@ -168,7 +168,7 @@
- .ENDIF
-
- .IF "$(CCNUMVER)"=="000300030000"
--LIBSTDCPP3="5.0.3"
-+LIBSTDCPP3="5.0.4"
- SHORTSTDCPP3="5"
- .ENDIF
-
+++ /dev/null
---- solenv/inc.orig/unxlngs.mk 2003-12-18 18:57:43.000000000 +0100
-+++ solenv/inc/unxlngs.mk 2003-12-18 19:24:07.000000000 +0100
-@@ -61,7 +61,7 @@
- #*************************************************************************
-
- # mk file for unxlngs
--ASM=gcc
-+ASM=$(CC)
- AFLAGS=-Wa,-Av8plus,-K,PIC -c $(CDEFS)
-
- SOLAR_JAVA*=TRUE
+++ /dev/null
---- solenv/inc/unxlngs.mk~ 2004-02-24 00:20:16.000000000 +0100
-+++ solenv/inc/unxlngs.mk 2004-02-24 00:42:46.000000000 +0100
-@@ -64,7 +64,7 @@
- ASM=gcc
- AFLAGS=-Wa,-Av8plus,-K,PIC -c $(CDEFS)
-
--SOLAR_JAVA=TRUE
-+SOLAR_JAVA=
- JAVAFLAGSDEBUG=-g
-
- # filter for supressing verbose messages from linker
-@@ -95,6 +96,15 @@
- CFLAGS=
- .ENDIF
- CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g
-+.ENDIF
-+
-+
- # flags for the C++ Compiler
- CFLAGSCC= -pipe
- # Flags for enabling exception handling
-@@ -129,10 +139,12 @@
- CFLAGSDBGUTIL=
- # Compiler flags for enabling optimazations
- # CFLAGSOPT=-O2
-+CFLAGSOPT=-O3 -fno-strict-aliasing
-+#CFLAGSOPT=-O2 -fno-strict-aliasing
- # reduce to -O1 to avoid optimisation problems
--CFLAGSOPT=-O1
-+#CFLAGSOPT=-O1
- # Compiler flags for disabling optimazations
--CFLAGSNOOPT=
-+CFLAGSNOOPT=-fno-strict-aliasing
- # Compiler flags for discibing the output path
- CFLAGSOUTOBJ=-o
- # Enable all warnings
-@@ -152,8 +164,10 @@
- LINKFLAGS=-z combreloc $(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
-+#LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
-
- # linker flags for linking shared libraries
- LINKFLAGSSHLGUI= -shared
-diff -u -r1.7.10.2 makefile.mk
---- crashrep/source/unx/makefile.mk 21 Aug 2003 09:46:32 -0000 1.7.10.2
-+++ crashrep/source/unx/makefile.mk 25 Aug 2003 11:28:34 -0000
-@@ -125,6 +125,9 @@
- .IF "$(OS)" == "FREEBSD"
- APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
- .ENDIF
-+.IF "$(CPUNAME)$(OS)"=="SPARCLINUX"
-+APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+.ENDIF
-
- .ENDIF
- # Building crash_report_static
-diff -u -r1.21 makefile.mk
---- dbaccess/util/makefile.mk 15 Apr 2003 13:33:01 -0000 1.21
-+++ dbaccess/util/makefile.mk 25 Aug 2003 11:28:40 -0000
-@@ -76,6 +76,9 @@
-
- LDUMP=ldump2.exe
-
-+.IF "$(OS)$(CPUNAME)"=="LINUXSPARC"
-+DYNAMIC+=-Wl,--export-dynamic
-+.ENDIF
- # --- database core (dba) -----------------------------------
-
- LIB1TARGET=$(SLB)$/dbaccess.lib
-diff -u -r1.4 backtrace.c
---- sal/osl/unx/backtrace.c 16 Jul 2003 17:20:28 -0000 1.4
-+++ sal/osl/unx/backtrace.c 25 Aug 2003 11:32:03 -0000
-@@ -81,11 +81,10 @@
-
- #else
-
--#error Unknown Solaris target platform.
-+#error Unknown Solaris target platform.
-
- #endif /* defined SPARC or INTEL */
-
--
- int backtrace( void **buffer, int max_frames )
- {
- struct frame *fp;
-@@ -177,7 +176,7 @@
- #include <exception.h>
- #include <sys/signal.h>
- #include <unistd.h>
--
-+
- /* Need extra libs -lexc -ldwarf -lelf */
-
- int backtrace( void **buffer, int max_frames )
-@@ -188,13 +187,13 @@
- memset(&context, 0, sizeof(struct sigcontext));
-
- exc_setjmp(&context);
-- while(context.sc_pc != 1 && i < max_frames) {
-- exc_unwind(&context, 0);
-+ while(context.sc_pc != 1 && i < max_frames) {
-+ exc_unwind(&context, 0);
- if(context.sc_pc != 1) {
- *(buffer++) = (void *)context.sc_pc;
- i++;
- }
-- }
-+ }
- return(i);
- }
-
-@@ -207,7 +206,7 @@
- if ( fp ) {
- while(context.sc_pc!=1) {
- if(context.sc_pc != 1) {
-- exc_unwind_name(&context, 0, &name);
-+ exc_unwind_name(&context, 0, &name);
- fprintf(fp, " 0x%012lx %.100s\n", context.sc_pc, name ? name : "<unknown function>");
- free(name);
- }
-@@ -219,3 +218,125 @@
- }
- #endif /* defined IRIX */
-
-+#if defined(LINUX)
-+#if defined(SPARC)
-+#define FRAME_PTR_OFFSET 1
-+#define FRAME_OFFSET 0
-+
-+#else
-+
-+#error Unknown Linux target platform.
-+#endif /* defined SPARC or INTEL */
-+
-+#include <pthread.h>
-+#include <setjmp.h>
-+#include <stdio.h>
-+#include "backtrace.h"
-+# define ptrdiff_t int
-+
-+typedef struct
-+{
-+ const char *dli_fname; /* File name of defining object. */
-+ void *dli_fbase; /* Load address of that object. */
-+ const char *dli_sname; /* Name of nearest symbol. */
-+ void *dli_saddr; /* Exact value of nearest symbol. */
-+} Dl_info;
-+
-+
-+
-+struct frame {
-+ long fr_local[8];
-+ long fr_arg[6];
-+ struct frame *fr_savfp;
-+ long fr_savpc;
-+# ifndef __arch64__
-+ char *fr_stret;
-+# endif
-+ long fr_argd[6];
-+ long fr_argx[0];
-+};
-+
-+/* http://gcc.gnu.org/ml/java-patches/2000-q2/msg00115.html */
-+
-+
-+int backtrace( void **buffer, int max_frames )
-+{
-+ struct frame *fp;
-+ jmp_buf ctx;
-+ int i;
-+
-+ /* flush register windows */
-+#ifdef SPARC
-+ asm("ta 3");
-+#endif
-+ /* get stack- and framepointer */
-+ setjmp(ctx);
-+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
-+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
-+ fp = fp->fr_savfp;
-+
-+ /* iterate through backtrace */
-+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
-+ {
-+ /* store frame */
-+ *(buffer++) = (void *)fp->fr_savpc;
-+ /* next frame */
-+ fp=fp->fr_savfp;
-+ }
-+ return i;
-+}
-+
-+void backtrace_symbols_fd( void **buffer, int size, int fd )
-+{
-+ FILE *fp = fdopen( fd, "w" );
-+
-+ if ( fp )
-+ {
-+ void **pFramePtr;
-+
-+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
-+ {
-+ Dl_info dli;
-+ ptrdiff_t offset;
-+
-+ if ( 0 != dladdr( *pFramePtr, &dli ) )
-+ {
-+ if ( dli.dli_fname && dli.dli_fbase )
-+ {
-+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
-+ }
-+ if ( dli.dli_sname && dli.dli_saddr )
-+ {
-+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
-+ }
-+ }
-+ fprintf( fp, "[0x%x]\n", *pFramePtr );
-+ }
-+
-+ fflush( fp );
-+ fclose( fp );
-+ }
-+}
-+
-+#endif /* defined LINUX */
-+
-+/* User functions for run-time dynamic loading.
-+ Copyright (C) 1995-1999,2000,2001,2003 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C 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 the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-diff -u -r1.4 backtrace.h
---- sal/osl/unx/backtrace.h 16 Jul 2003 17:20:38 -0000 1.4
-+++ sal/osl/unx/backtrace.h 25 Aug 2003 11:32:03 -0000
-@@ -60,7 +60,7 @@
- ************************************************************************/
-
-
--#if defined (SOLARIS) || (FREEBSD)
-+#if defined (SOLARIS) || (FREEBSD) || (LINUX)
-
- #ifdef __cplusplus
- extern "C" {
-diff -u -r1.23 makefile.mk
---- sal/osl/unx/makefile.mk 16 Jul 2003 17:21:01 -0000 1.23
-+++ sal/osl/unx/makefile.mk 25 Aug 2003 11:32:03 -0000
-@@ -137,7 +137,7 @@
- $(OBJ)$/file_stat.obj
- #.ENDIF
-
--.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
-+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)$(CPU)"="LINUXS"
- SLOFILES += $(SLO)$/backtrace.obj
- OBJFILES += $(OBJ)$/backtrace.obj
- .ENDIF
-diff -u -r1.18.42.1 makefile.mk
---- sc/util/makefile.mk 15 Aug 2003 11:52:48 -0000 1.18.42.1
-+++ sc/util/makefile.mk 25 Aug 2003 11:32:25 -0000
-@@ -83,7 +83,9 @@
- .IF "$(OS)"=="IRIX"
- LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
- .ENDIF
--
-+.IF "$(OS)$(CPUNAME)"=="LINUXSPARC"
-+DYNAMIC+=-Wl,--export-dynamic
-+.ENDIF
- # --- Resourcen ----------------------------------------------------
-
- RESLIB1LIST=\
-diff -u -r1.20.86.1 makefile.mk
---- sd/util/makefile.mk 15 Aug 2003 11:50:45 -0000 1.20.86.1
-+++ sd/util/makefile.mk 25 Aug 2003 11:32:45 -0000
-@@ -84,6 +84,9 @@
- LINKFLAGS+=/SEGMENTS:512 /PACKD:32768
- .ENDIF
-
-+.IF "$(OS)$(CPUNAME)"=="LINUXSPARC"
-+DYNAMIC+=-Wl,--export-dynamic
-+.ENDIF
- # --- Resourcen ----------------------------------------------------
-
- .IF "$(GUI)"=="WIN"
-diff -u -r1.24.104.1 makefile.mk
---- sw/util/makefile.mk 15 Aug 2003 11:47:10 -0000 1.24.104.1
-+++ sw/util/makefile.mk 25 Aug 2003 11:33:50 -0000
-@@ -109,6 +109,10 @@
- LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=40
- .ENDIF
-
-+.IF "$(OS)$(CPUNAME)"=="LINUXSPARC"
-+DYNAMIC+=-Wl,--export-dynamic
-+.ENDIF
-+
- .IF "$(header)" == ""
-
- sw_res_files= \
-
---- boost/boost_1_27_0.patch.orig 2004-01-29 07:31:14.000000000 -0500
-+++ boost/boost_1_27_0.patch 2004-01-29 10:20:21.869315000 -0500
-@@ -202,10 +200,10 @@
- + : "m" (pCount->aVal)
- + : "memory");
- +
--+ return nCount;
--+ }
-++ return nCount;
-++}
- +
--+ #elif defined ( POWERPC ) || defined(__powerpc__) || defined (ppc)
-++#elif defined ( POWERPC ) || defined(__powerpc__) || defined (ppc)
- +
- + static __inline__ int atomic_inc(atomic_t * pCount)
- + {
-@@ -239,8 +237,8 @@
- + : "r" (pCount), "m" (pCount->aVal)
- + : "cc");
- +
--+ return nCount;
--+ }
-++ return nCount;
-++}
- +
- +
- +#elif defined(__s390__)
+++ /dev/null
-Index: boost_1_27_0.patch
-===================================================================
-RCS file: /cvs/external/boost/boost_1_27_0.patch,v
-retrieving revision 1.4.4.1
-diff -u -r1.4.4.1 boost_1_27_0.patch
---- boost/boost_1_27_0.patch 28 Jul 2003 16:55:40 -0000 1.4.4.1
-+++ boost/boost_1_27_0.patch 2 Aug 2003 12:48:16 -0000
-@@ -157,7 +157,7 @@
- --- misc/build/boost_1_27_0/boost/detail/linux_atomic.h Wed May 7 11:32:48 2003
- ***************
- *** 0 ****
----- 1,181 ----
-+--- 1,119 ----
- + #ifndef _LINUX_ATOMIC_H_
- + #define _LINUX_ATOMIC_H_
- +
-@@ -268,75 +268,24 @@
- + __CS_LOOP(old_val, new_val, v, 1, "sr");
- + return new_val;
- +}
--+#elif defined ( SPARC )
- +
--+
--+#define atomic_set(v, i) (((v)->aVal) = ((i) << 8))
--+
--+static __inline__ int __atomic_add(int i, atomic_t *v)
--+{
--+ register volatile int *ptr asm("g1");
--+ register int increment asm("g2");
--+
--+ ptr = &v->aVal;
--+ increment = i;
--+
--+ __asm__ __volatile__(
--+ "mov %%o7, %%g4\n\t"
--+ "call ___atomic_add\n\t"
--+ " add %%o7, 8, %%o7\n"
--+ : "=&r" (increment)
--+ : "0" (increment), "r" (ptr)
--+ : "g3", "g4", "g7", "memory", "cc");
--+
--+ return increment;
--+}
--+
--+static __inline__ int __atomic_sub(int i, atomic_t *v)
--+{
--+ register volatile int *ptr asm("g1");
--+ register int increment asm("g2");
--+
--+ ptr = &v->aVal;
--+ increment = i;
--+
--+ __asm__ __volatile__(
--+ "mov %%o7, %%g4\n\t"
--+ "call ___atomic_sub\n\t"
--+ " add %%o7, 8, %%o7\n"
--+ : "=&r" (increment)
--+ : "0" (increment), "r" (ptr)
--+ : "g3", "g4", "g7", "memory", "cc");
--+
--+ return increment;
--+}
--+
--+#define atomic_add(i, v) ((void)__atomic_add((i), (v)))
--+#define atomic_sub(i, v) ((void)__atomic_sub((i), (v)))
--+
--+#define atomic_dec_return(v) __atomic_sub(1, (v))
--+#define atomic_inc_return(v) __atomic_add(1, (v))
--+
--+#define atomic_sub_and_test(i, v) (__atomic_sub((i), (v)) == 0)
--+#define atomic_dec_and_test(v) (__atomic_sub(1, (v)) == 0)
--+
--+#define atomic_inc(v) ((void)__atomic_add(1, (v)))
--+#define atomic_dec(v) ((void)__atomic_sub(1, (v)))
--+
--+#define atomic_add_negative(i, v) (__atomic_add((i), (v)) < 0)
--+
--+/* Atomic operations are already serializing */
--+#define smp_mb__before_atomic_dec() barrier()
--+#define smp_mb__after_atomic_dec() barrier()
--+#define smp_mb__before_atomic_inc() barrier()
--+#define smp_mb__after_atomic_inc() barrier()
--+
- +#endif
- + #else
--+
-++
- + #error - need to define your processors atomic inc and dec here
--+
-++
- + #endif
- +
--+
-++
- + #endif
-+--- misc/build/boost_1_27_0/boost/detail/atomic_count.hpp.orig 2002-02-08 02:26:13.000000000 +1100
-++++ misc/build/boost_1_27_0/boost/detail/atomic_count.hpp 2003-08-02 22:38:16.000000000 +1000
-+@@ -93,7 +93,7 @@
-+
-+ #include <boost/detail/atomic_count_win32.hpp>
-+
-+-#elif defined(linux) || defined(__linux) || defined(__linux__)
-++#elif (defined(linux) || defined(__linux) || defined(__linux__)) && !(defined(SPARC) || defined(sparc) || defined(sparc64))
-+
-+ #include <boost/detail/atomic_count_linux.hpp>
-+
+++ /dev/null
-Index: vcl/unx/source/gdi/salgdi2.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi2.cxx,v
-retrieving revision 1.18
-diff -u -p -u -r1.18 salgdi2.cxx
---- vcl/unx/source/gdi/salgdi2.cxx 10 Jun 2003 14:31:08 -0000 1.18
-+++ vcl/unx/source/gdi/salgdi2.cxx 14 Oct 2003 13:12:49 -0000
-@@ -775,10 +775,13 @@ void SalGraphics::DrawBitmap( const SalT
- XGCValues aOldVal, aNewVal;
- int nValues = GCForeground | GCBackground;
-
-- // set foreground/background values for 1Bit bitmaps
-- XGetGCValues( pXDisp, aGC, nValues, &aOldVal );
-- aNewVal.foreground = rColMap.GetWhitePixel(), aNewVal.background = rColMap.GetBlackPixel();
-- XChangeGC( pXDisp, aGC, nValues, &aNewVal );
-+ if( rSalBitmap.GetBitCount() == 1 )
-+ {
-+ // set foreground/background values for 1Bit bitmaps
-+ XGetGCValues( pXDisp, aGC, nValues, &aOldVal );
-+ aNewVal.foreground = rColMap.GetWhitePixel(), aNewVal.background = rColMap.GetBlackPixel();
-+ XChangeGC( pXDisp, aGC, nValues, &aNewVal );
-+ }
-
- #if defined(_USE_PRINT_EXTENSION_)
- rSalBitmap.ImplDraw( pSalDisp, aDrawable, nDepth, *pPosAry, aGC );
-@@ -786,7 +789,8 @@ void SalGraphics::DrawBitmap( const SalT
- rSalBitmap.ImplDraw( aDrawable, nDepth, *pPosAry, aGC );
- #endif
-
-- XChangeGC( pXDisp, aGC, nValues, &aOldVal );
-+ if( rSalBitmap.GetBitCount() == 1 )
-+ XChangeGC( pXDisp, aGC, nValues, &aOldVal );
- XFlush( pXDisp );
-
- #ifndef _USE_PRINT_EXTENSION_
-@@ -1058,12 +1062,7 @@ SalBitmap *SalGraphics::GetBitmap( long
- if( &_GetDisplay()->GetColormap() != &_GetColormap() )
- nBitCount = 1;
-
--
--#if defined(_USE_PRINT_EXTENSION_)
-- pSalBitmap->ImplCreateFromDrawable( _GetDisplay(), _GetDrawable(), nBitCount, nX, nY, nDX, nDY );
--#else
-- pSalBitmap->ImplCreateFromDrawable( _GetDrawable(), nBitCount, nX, nY, nDX, nDY );
--#endif
-+ pSalBitmap->ImplCreateLocalFromDrawable( _GetDrawable(), nBitCount, nX, nY, nDX, nDY );
- return pSalBitmap;
-
- #ifndef _USE_PRINT_EXTENSION_
-Index: vcl/unx/inc/salbmp.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/salbmp.hxx,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 salbmp.hxx
---- vcl/unx/inc/salbmp.hxx 29 Aug 2001 16:14:00 -0000 1.3
-+++ vcl/unx/inc/salbmp.hxx 14 Oct 2003 13:13:18 -0000
-@@ -123,6 +124,12 @@ public:
- long nX, long nY,
- long nWidth, long nHeight );
-
-+ BOOL ImplCreateLocalFromDrawable(
-+ Drawable aDrawable,
-+ long nDrawableDepth,
-+ long nX, long nY,
-+ long nWidth, long nHeight );
-+
- XImage* ImplCreateXImage(
- SalDisplay* pSalDisp, long nDepth,
- const SalTwoRect& rTwoRect ) const;
-Index: vcl/unx/source/gdi/salbmp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/gdi/salbmp.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 salbmp.cxx
---- vcl/unx/source/gdi/salbmp.cxx 11 Sep 2001 15:52:22 -0000 1.8
-+++ vcl/unx/source/gdi/salbmp.cxx 14 Oct 2003 13:13:48 -0000
-@@ -502,6 +506,17 @@ BOOL SalBitmap::ImplCreateFromDrawable(
- // -----------------------------------------------------------------------------
- #endif
-
-+BOOL SalBitmap::ImplCreateLocalFromDrawable( Drawable aDrawable, long nDrawableDepth,
-+ long nX, long nY, long nWidth, long nHeight )
-+{
-+ Destroy();
-+
-+ if( aDrawable && nWidth && nHeight && nDrawableDepth )
-+ mpDIB = ImplCreateDIB( aDrawable, nDrawableDepth, nX, nY, nWidth, nHeight );
-+
-+ return( mpDIB != NULL );
-+}
-+
- BOOL
- SalBitmap::SnapShot (Display* pDisplay, XLIB_Window hWindow)
- {
+++ /dev/null
-Index: svx/source/stbctrls/pszctrl.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/stbctrls/pszctrl.cxx,v
-retrieving revision 1.5
-diff -u -r1.5 pszctrl.cxx
---- svx/source/stbctrls/pszctrl.cxx 10 Jul 2001 11:22:50 -0000 1.5
-+++ svx/source/stbctrls/pszctrl.cxx 6 Dec 2002 16:41:37 -0000
-@@ -143,10 +143,9 @@
- eInUnit = FUNIT_100TH_MM;
-
- String sMetric;
-- LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
-- const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
-+ const sal_Unicode cSep = Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep().GetChar(0);
- long nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0,
-- eInUnit, eOutUnit );
-+ eInUnit, eOutUnit );
-
- if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) )
- sMetric += '-';
+++ /dev/null
-Index: oo_cvs/offmgr/source/offapp/dialog/opthtml.src
-===================================================================
-RCS file: /cvs/framework/offmgr/source/offapp/dialog/opthtml.src,v
-retrieving revision 1.38
-diff -u -3 -p -r1.38 opthtml.src
---- offmgr/source/offapp/dialog/opthtml.src 13 Jun 2003 11:38:08 -0000 1.38
-+++ offmgr/source/offapp/dialog/opthtml.src 4 Jul 2003 08:27:15 -0000
-@@ -459,7 +459,7 @@ TabPage RID_OFAPAGE_HTMLOPT
- Text [ spanish ] = "Importar HTML-Tags ~desconocidos como campos" ;
- Text [ french ] = "Importer les balises HTML inconnues comme champs" ;
- Text [ dutch ] = "~Onbekende HTML-tags als velden importeren" ;
-- Text [ swedish ] = "~Importera okÀnda HTLM-taggar som fÀlt" ;
-+ Text [ swedish ] = "~Importera okÀnda HTML-taggar som fÀlt" ;
- Text [ danish ] = "Importer ukendte HTML-koder som felter" ;
- Text [ portuguese ] = "~Importar HTML-Tags desconhecidos como campos" ;
- Text [ portuguese_brazilian ] = "~Importar Tags HTML desconhecidos como campos" ;
+++ /dev/null
---- oo_1.1_src/offmgr/source/offapp/intro/ooo.src.orig 2003-09-22 20:48:59.000000000 +0200
-+++ oo_1.1_src/offmgr/source/offapp/intro/ooo.src 2003-11-30 16:04:31.000000000 +0100
-@@ -81,14 +81,14 @@
- #define OOO_LICENSE "LGPL"
- #define OOO_INTRO "openintro_sun.bmp"
- #else
--//#define OOO_VENDOR "my company"
-+#define OOO_VENDOR "PLD Linux Distribution"
- #define OOO_LICENSE "LGPL"
--#define OOO_INTRO "openintro.bmp"
-+#define OOO_INTRO "openintro_pld.bmp"
- #endif
-
- Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
- {
-- File = "openabout.bmp" ;
-+ File = "openabout_pld.bmp" ;
- };
-
- Bitmap RID_DEFAULTINTRO
+++ /dev/null
---- oo/starmath/source/register.cxx.orig Fri May 23 23:41:19 2003
-+++ oo/starmath/source/register.cxx Fri May 23 23:41:57 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -154,7 +154,7 @@
- RTL_CONSTASCII_USTRINGPARAM("/") ) + SmXMLImport_getImplementationName() +
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-- ::com::sun::star::uno::Sequence< rtl::OUString > &rServices =
-+ const ::com::sun::star::uno::Sequence< rtl::OUString > &rServices =
- SmXMLImport_getSupportedServiceNames();
- for(i = 0; i < rServices.getLength(); i++ )
- xNewKey->createKey( rServices.getConstArray()[i]);
+++ /dev/null
-Index: vcl/inc/svapp.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/svapp.hxx,v
-retrieving revision 1.27
-diff -u -p -u -r1.27 svapp.hxx
---- vcl/inc/svapp.hxx 10 Jun 2003 14:29:14 -0000 1.27
-+++ vcl/inc/svapp.hxx 2 Sep 2003 14:25:16 -0000
-@@ -347,7 +347,7 @@ public:
- virtual void FocusChanged();
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
-- virtual void Init();
-+ virtual BOOL Init();
- virtual void DeInit();
-
- static void InitAppRes( const ResId& rResId );
-Index: vcl/source/app/svapp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/app/svapp.cxx,v
-retrieving revision 1.44
-diff -u -p -u -r1.44 svapp.cxx
---- vcl/source/app/svapp.cxx 15 Apr 2003 16:05:08 -0000 1.44
-+++ vcl/source/app/svapp.cxx 2 Sep 2003 14:25:17 -0000
-@@ -423,8 +423,9 @@ void Application::DataChanged( const Dat
- }
-
- // -----------------------------------------------------------------------
--void Application::Init()
-+BOOL Application::Init()
- {
-+ return TRUE;
- }
-
- // -----------------------------------------------------------------------
-Index: vcl/source/app/svmain.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/app/svmain.cxx,v
-retrieving revision 1.41
-diff -u -p -u -r1.41 svmain.cxx
---- vcl/source/app/svmain.cxx 11 Apr 2003 17:28:07 -0000 1.41
-+++ vcl/source/app/svmain.cxx 2 Sep 2003 14:26:58 -0000
-@@ -365,7 +365,8 @@ BOOL InitVCL( const ::com::sun::star::un
- if( pSVData->mpApp )
- // call init to initialize application class
- // soffice/sfx implementation creates the global service manager
-- pSVData->mpApp->Init();
-+ if(! pSVData->mpApp->Init() )
-+ return FALSE;
-
- #ifdef REMOTE_APPSERVER
- {
-Index: desktop/inc/app.hxx
-===================================================================
-RCS file: /cvs/framework/desktop/inc/app.hxx,v
-retrieving revision 1.19
-diff -u -p -u -r1.19 app.hxx
---- desktop/inc/app.hxx 10 Jun 2003 14:37:19 -0000 1.19
-+++ desktop/inc/app.hxx 2 Sep 2003 14:28:34 -0000
-@@ -128,7 +128,7 @@ class Desktop : public Application
- Desktop();
- ~Desktop();
- virtual void Main( );
-- virtual void Init();
-+ virtual BOOL Init();
- virtual void DeInit();
- virtual BOOL QueryExit();
- virtual USHORT Exception(USHORT nError);
-Index: desktop/source/app/app.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/app/app.cxx,v
-retrieving revision 1.119
-diff -u -p -u -r1.119 app.cxx
---- desktop/source/app/app.cxx 16 Jul 2003 17:41:22 -0000 1.119
-+++ desktop/source/app/app.cxx 2 Sep 2003 14:28:36 -0000
-@@ -555,7 +555,7 @@ Desktop::~Desktop()
- {
- }
-
--void Desktop::Init()
-+BOOL Desktop::Init()
- {
- RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
-
-@@ -575,7 +575,7 @@ void Desktop::Init()
- // check whether we need to print cmdline help
- if ( pCmdLineArgs->IsHelp() ) {
- displayCmdlineHelp();
-- _exit(0);
-+ return FALSE;
- }
- #endif
- // start ipc thread only for non-remote offices
-@@ -589,7 +589,7 @@ void Desktop::Init()
- else if ( aStatus == OfficeIPCThread::IPC_STATUS_2ND_OFFICE )
- {
- // 2nd office startup should terminate after sending cmdlineargs through pipe
-- _exit( 0 );
-+ return FALSE;
- }
- else if ( pCmdLineArgs->IsHelp() )
- {
-@@ -599,6 +599,7 @@ void Desktop::Init()
-
- pSignalHandler = new SalMainPipeExchangeSignalHandler;
- }
-+ return TRUE;
- }
-
- void Desktop::DeInit()
-Index: vcl/unx/source/app/saldisp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
-retrieving revision 1.43.26.2
-diff -u -p -u -r1.43.26.2 saldisp.cxx
---- vcl/unx/source/app/saldisp.cxx 29 Jul 2003 12:45:39 -0000 1.43.26.2
-+++ vcl/unx/source/app/saldisp.cxx 2 Sep 2003 14:30:04 -0000
-@@ -792,6 +792,15 @@ SalDisplay::~SalDisplay( )
- SalBitmap::ImplDestroyCache();
- DestroyFontCache();
-
-+#ifdef HAVE_LIBSN
-+ if( m_pSnLauncheeContext )
-+ {
-+ sn_launchee_context_complete( m_pSnLauncheeContext );
-+ sn_launchee_context_unref( m_pSnLauncheeContext );
-+ }
-+ sn_display_unref( m_pSnDisplay );
-+#endif /* HAVE_LIBSN */
-+
- if( IsDisplay() )
- {
- osl_destroyMutex( hEventGuard_ );
-@@ -837,12 +846,6 @@ SalDisplay::~SalDisplay( )
- XCloseDisplay( pDisp_ );
- }
-
--#ifdef HAVE_LIBSN
-- if( m_pSnLauncheeContext )
-- sn_launchee_context_unref( m_pSnLauncheeContext );
-- sn_display_unref( m_pSnDisplay );
--#endif /* HAVE_LIBSN */
--
- pDisp_ = (Display*)ILLEGAL_POINTER;
-
- pSalData->Remove( this );
-Index: vcl/unx/source/app/salinst.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/salinst.cxx,v
-retrieving revision 1.16
-diff -u -p -u -r1.16 salinst.cxx
---- vcl/unx/source/app/salinst.cxx 22 Jul 2003 10:12:20 -0000 1.16
-+++ vcl/unx/source/app/salinst.cxx 2 Sep 2003 14:55:27 -0000
-@@ -180,6 +180,15 @@ void InitSalMain()
-
- void DeInitSalMain()
- {
-+#if 0
-+// Probably not needed - but must test this ...
-+ // Hack: seemingly shutdown doesn't clean these up
-+ SalData *pData;
-+ if( ( pData = GetSalData() ) ) {
-+ delete pData;
-+ SetSalData( NULL );
-+ }
-+#endif
- }
-
- void SetFilterCallback( void* pCallback, void* pInst )
+++ /dev/null
---- oo/i18nutil/source/utility/widthfolding.cxx.orig Sat Jul 12 16:44:09 2003
-+++ oo/i18nutil/source/utility/widthfolding.cxx Sat Jul 12 16:43:27 2003
-@@ -60,7 +60,7 @@
- ************************************************************************/
-
- // prevent internal compiler error with MSVC6SP3
--#include <stl/utility>
-+//#include <stl/utility>
- #include <i18nutil/widthfolding.hxx>
- #include <i18nutil/x_rtl_ustring.h>
- #include "widthfolding_data.h"
+++ /dev/null
---- filter/source/svg/svgfilter.hxx.orig 2003-08-09 19:28:05.000000000 -0700
-+++ filter/source/svg/svgfilter.hxx 2003-08-09 21:45:14.000000000 -0700
-@@ -83,9 +83,11 @@
- #ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
- #include <com/sun/star/document/XFilter.hpp>
- #endif
-+#ifdef SOLAR_JAVA
- #ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
- #include <com/sun/star/document/XImporter.hpp>
- #endif
-+#endif // SOLAR_JAVA
- #ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
- #include <com/sun/star/document/XExporter.hpp>
- #endif
-@@ -104,9 +106,15 @@
- #ifndef _CPPUHELPER_IMPLBASE1_HXX_
- #include <cppuhelper/implbase1.hxx>
- #endif
-+#ifdef SOLAR_JAVA
- #ifndef _CPPUHELPER_IMPLBASE5_HXX_
- #include <cppuhelper/implbase5.hxx>
- #endif
-+#else // !SOLAR_JAVA
-+#ifndef _CPPUHELPER_IMPLBASE4_HXX_
-+#include <cppuhelper/implbase4.hxx>
-+#endif
-+#endif
- #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
- #include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #endif
-@@ -152,7 +160,9 @@
- #include <svx/svdxcgv.hxx>
- #include <svx/svdobj.hxx>
- #include <xmloff/xmlexp.hxx>
-+#ifdef SOLAR_JAVA
- #include <sj2/jnihelp.hxx>
-+#endif
- #include "svgfilter.hxx"
- #include "svgscript.hxx"
-
-@@ -238,11 +248,18 @@
- class SVGFontExport;
- class SVGActionWriter;
-
-+#ifdef SOLAR_JAVA
- class SVGFilter : public cppu::WeakImplHelper5 < XFilter,
- XImporter,
- XExporter,
- XInitialization,
- XServiceInfo >
-+#else // !SOLAR_JAVA
-+class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
-+ XExporter,
-+ XInitialization,
-+ XServiceInfo >
-+#endif
- {
- typedef ::std::hash_map< Reference< XInterface >, ObjectRepresentation, HashReferenceXInterface > ObjectMap;
-
-@@ -251,14 +268,18 @@
- ObjectMap* mpObjects;
- Reference< XMultiServiceFactory > mxMSF;
- Reference< XComponent > mxSrcDoc;
-+#ifdef SOLAR_JAVA
- Reference< XComponent > mxDstDoc;
-+#endif
- SvXMLElementExport* mpSVGDoc;
- SVGExport* mpSVGExport;
- SVGFontExport* mpSVGFontExport;
- SVGActionWriter* mpSVGWriter;
- sal_Bool mbPresentation;
-
-+#ifdef SOLAR_JAVA
- sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
-+#endif
-
- sal_Bool implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
- Reference< XDocumentHandler > implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
-@@ -292,8 +313,10 @@
- virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
- virtual void SAL_CALL cancel( ) throw (RuntimeException);
-
-+#ifdef SOLAR_JAVA
- // XImporter
- virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
-+#endif
-
- // XExporter
- virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
---- filter/source/svg/makefile.mk.orig 2003-08-09 20:06:22.000000000 -0700
-+++ filter/source/svg/makefile.mk 2003-08-09 20:07:54.000000000 -0700
-@@ -99,10 +99,12 @@
-
- SLOFILES= $(SLO)$/svguno.obj \
- $(SLO)$/svgfilter.obj \
-- $(SLO)$/svgimport.obj \
- $(SLO)$/svgexport.obj \
- $(SLO)$/svgfontexport.obj \
- $(SLO)$/svgwriter.obj
-+.IF "$(SOLAR_JAVA)"!=""
-+SLOFILES+= $(SLO)$/svgimport.obj
-+.ENDIF
-
- # --- Library -----------------------------------
-
-@@ -112,7 +114,6 @@
- $(SVXLIB) \
- $(XMLOFFLIB) \
- $(GOODIESLIB) \
-- $(SJLIB) \
- $(VCLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
-@@ -120,7 +121,10 @@
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
--
-+.IF "$(SOLAR_JAVA)"!=""
-+SHL1STDLIBS+=\
-+ $(SJLIB)
-+.ENDIF
-
- SHL1DEPN=
- SHL1IMPLIB= i$(SHL1TARGET)
---- filter/source/svg/svgfilter.cxx.orig 2003-08-09 20:03:37.000000000 -0700
-+++ filter/source/svg/svgfilter.cxx 2003-08-09 21:46:50.000000000 -0700
-@@ -97,9 +97,12 @@
- if( pFocusWindow )
- pFocusWindow->EnterWait();
-
-+#ifdef SOLAR_JAVA
- if( mxDstDoc.is() )
- bRet = implImport( rDescriptor );
-- else if( mxSrcDoc.is() )
-+ else
-+#endif
-+ if( mxSrcDoc.is() )
- bRet = implExport( rDescriptor );
- else
- bRet = sal_False;
-@@ -126,11 +129,13 @@
-
- // -----------------------------------------------------------------------------
-
-+#ifdef SOLAR_JAVA
- void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
- {
- mxDstDoc = xDoc;
- }
-+#endif
-
- // -----------------------------------------------------------------------------
-
+++ /dev/null
---- svtools/prj/build.lst.org 2004-03-30 08:42:42.000000000 +0000
-+++ svtools/prj/build.lst 2004-03-30 08:43:16.000000000 +0000
-@@ -51,4 +51,4 @@
- st svtools\source\passwordcontainer nmake - all st_passcont NULL
- st svtools\source\syslocale nmake - all st_sysloc NULL
- st svtools\source\filepicker nmake - all st_filepick st_bmp NULL
--st svtools\util nmake - all st_util st__brw st__access st__ctr st__dde st__item st__misc st__srch st__url st_cmdparse st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_ueaimp.u st_ufilt.u st_msdde.m st_msc.m st_undo st_uno st_vfilt st_vigif st_vipng st_vixbm st_vixpm st_vjpeg st_vwmf st_passcont st_sysloc st_filepick st_not st_conf st_sbx st_mem NULL
-+st svtools\util nmake - all st_util st__brw st__access st__ctr st__dde st__item st__misc st__srch st__url st_cmdparse st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_ueaimp.u st_ufilt.u st_msdde.m st_msc.m st_undo st_uno st_vfilt st_vigif st_vipng st_vixbm st_vixpm st_vjpeg st_vwmf st_passcont st_sysloc st_filepick st_not st_conf st_sbx NULL
+++ /dev/null
---- svx/source/editeng/impedit2.cxx.freezefix 2003-10-08 16:27:07.000000000 -0400
-+++ svx/source/editeng/impedit2.cxx 2003-10-08 16:27:19.000000000 -0400
-@@ -59,6 +59,8 @@
- *
- ************************************************************************/
-
-+#include <stdio.h>
-+
- #include <eeng_pch.hxx>
-
- #pragma hdrstop
-@@ -1640,7 +1642,13 @@
- }
-
- if ( rTypes[0].nScriptType == i18n::ScriptType::WEAK )
-- rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ? rTypes[1].nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
-+ {
-+ //--- rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ? rTypes[1].nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
-+ if ( rTypes.Count() > 1 )
-+ rTypes[0].nScriptType = rTypes[1].nScriptType;
-+ else
-+ rTypes[0].nScriptType = GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
-+ }
- }
- }
-
+++ /dev/null
---- oo/svx/source/options/optcolor.cxx.orig Fri May 23 22:50:44 2003
-+++ oo/svx/source/options/optcolor.cxx Fri May 23 22:51:11 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -946,7 +946,7 @@
- }
- else
- {
-- Color& rColor = pBox->GetSelectEntryColor();
-+ const Color& rColor = pBox->GetSelectEntryColor();
- aColorEntry.nColor = rColor.GetColor();
- if(aScrollWindow.aWindows[i])
- aScrollWindow.aWindows[i]->SetBackground(Wallpaper(rColor));
+++ /dev/null
---- oo/sw/source/filter/xml/xmltexti.cxx.orig Sat May 24 14:38:53 2003
-+++ oo/sw/source/filter/xml/xmltexti.cxx Sat May 24 14:39:29 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -827,7 +827,7 @@
- void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
- sal_Bool bStart)
- {
-- OUString& rId = GetOpenRedlineId();
-+ const OUString& rId = GetOpenRedlineId();
- if ((NULL != pRedlineHelper) && (rId.getLength() > 0))
- {
- Reference<XTextRange> xTextRange( GetCursor()->getStart() );
---- oo/sw/source/ui/dbui/dbtree.cxx.orig Sat May 24 15:32:41 2003
-+++ oo/sw/source/ui/dbui/dbtree.cxx Sat May 24 15:33:01 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -349,8 +349,8 @@
- const OUString* pDBNames = aDBNames.getConstArray();
- long nCount = aDBNames.getLength();
-
-- Image& rImg = aImageList.GetImage(IMG_DB);
-- Image& rHCImg = aImageListHC.GetImage(IMG_DB);
-+ const Image& rImg = aImageList.GetImage(IMG_DB);
-+ const Image& rHCImg = aImageListHC.GetImage(IMG_DB);
- for(long i = 0; i < nCount; i++)
- {
- String sDBName(pDBNames[i]);
-@@ -499,8 +499,8 @@
- String sTableName;
- long nCount = aTblNames.getLength();
- const OUString* pTblNames = aTblNames.getConstArray();
-- Image& rImg = aImageList.GetImage(IMG_DBTABLE);
-- Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
-+ const Image& rImg = aImageList.GetImage(IMG_DBTABLE);
-+ const Image& rHCImg = aImageListHC.GetImage(IMG_DBTABLE);
- for (long i = 0; i < nCount; i++)
- {
- sTableName = pTblNames[i];
-@@ -520,8 +520,8 @@
- String sQueryName;
- long nCount = aQueryNames.getLength();
- const OUString* pQueryNames = aQueryNames.getConstArray();
-- Image& rImg = aImageList.GetImage(IMG_DBQUERY);
-- Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
-+ const Image& rImg = aImageList.GetImage(IMG_DBQUERY);
-+ const Image& rHCImg = aImageListHC.GetImage(IMG_DBQUERY);
- for (long i = 0; i < nCount; i++)
- {
- sQueryName = pQueryNames[i];
---- oo/sw/source/ui/uno/SwXDocumentSettings.cxx.orig Sat May 24 16:01:31 2003
-+++ oo/sw/source/ui/uno/SwXDocumentSettings.cxx Sat May 24 16:03:07 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -471,21 +471,21 @@
- break;
- case HANDLE_CURRENT_DATABASE_DATA_SOURCE:
- {
-- SwDBData& rData = mpDoc->GetDBData();
-+ const SwDBData& rData = mpDoc->GetDBData();
- if ( rValue >>= rData.sDataSource )
- mpDoc->ChgDBData( rData );
- }
- break;
- case HANDLE_CURRENT_DATABASE_COMMAND:
- {
-- SwDBData& rData = mpDoc->GetDBData();
-+ const SwDBData& rData = mpDoc->GetDBData();
- if ( rValue >>= rData.sCommand )
- mpDoc->ChgDBData( rData );
- }
- break;
- case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
- {
-- SwDBData& rData = mpDoc->GetDBData();
-+ const SwDBData& rData = mpDoc->GetDBData();
- if ( rValue >>= rData.nCommandType )
- mpDoc->ChgDBData( rData );
- }
---- oo/sw/source/ui/shells/basesh.cxx.orig Sat May 24 16:53:00 2003
-+++ oo/sw/source/ui/shells/basesh.cxx Sat May 24 16:53:28 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -752,7 +752,7 @@
- {
- case FN_REPAGINATE:
- {
-- Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
-+ const Reference < XModel > & xModel = GetView().GetDocShell()->GetModel();
- Reference < XUnoTunnel > xDocTunnel ( xModel, UNO_QUERY );
- SwXTextDocument *pDoc = reinterpret_cast < SwXTextDocument * > ( xDocTunnel->getSomething ( SwXTextDocument::getUnoTunnelId() ) );
- pDoc->notifyRefreshListeners();
---- oo/sw/source/ui/fldui/changedb.cxx.orig Sat May 24 17:13:49 2003
-+++ oo/sw/source/ui/fldui/changedb.cxx Sat May 24 17:14:22 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -258,14 +258,14 @@
- USHORT nParent = 0;
- USHORT nChild = 0;
-
-- Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
-- Image& rDBImg = aImageList.GetImage(IMG_DB);
-- Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
-- Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
-- Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
-- Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
-- Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
-- Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
-+ const Image& rTableImg = aImageList.GetImage(IMG_DBTABLE);
-+ const Image& rDBImg = aImageList.GetImage(IMG_DB);
-+ const Image& rQueryImg = aImageList.GetImage(IMG_DBQUERY);
-+ const Image& rHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
-+ const Image& rHCDBImg = aImageListHC.GetImage(IMG_DB);
-+ const Image& rHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
-+ const Image& rToInsert = nCommandType ? rQueryImg : rTableImg;
-+ const Image& rHCToInsert = nCommandType ? rHCQueryImg : rHCTableImg;
- while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)
- {
- if (sDBName == aUsedDBTLB.GetEntryText(pParent))
+++ /dev/null
-diff -Nur oo.orig/berkeleydb/makefile.mk oo.chng/berkeleydb/makefile.mk
---- oo.orig/berkeleydb/makefile.mk Thu Jun 12 11:50:38 2003
-+++ oo.chng/berkeleydb/makefile.mk Wed Jul 30 19:14:32 2003
-@@ -65,6 +65,16 @@
- PRJNAME=so_berkeleydb
- TARGET=so_berkeleydb
-
-+# --- Hack to get system db libraries ------------------------------
-+.IF "$(GUI)"=="UNX"
-+all:
-+ @echo "Since you're running a real OS, we're assuming you have db..."
-+ +$(COPY) /usr$/lib$/libdb-4.2.so $(DLLDEST)
-+ +$(COPY) /usr$/lib$/libdb_cxx-4.2.so $(DLLDEST)
-+ +$(COPY) /usr$/lib$/libdb_java-4.2.so $(DLLDEST)
-+ +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
-+.ENDIF
-+
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
-diff -Nur oo.orig/berkeleydb/prj/d.lst oo.chng/berkeleydb/prj/d.lst
---- oo.orig/berkeleydb/prj/d.lst Mon Jul 14 20:43:57 2003
-+++ oo.chng/berkeleydb/prj/d.lst Wed Jul 30 19:13:27 2003
-@@ -1,15 +1,17 @@
- mkdir: %_DEST%\inc%_EXT%\berkeleydb
-
--..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
--..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
--..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
-+\usr\include\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
-+\usr\include\cxx_common.h %_DEST%\inc%_EXT%\berkeleydb\cxx_common.h
-+\usr\include\cxx_except.h %_DEST%\inc%_EXT%\berkeleydb\cxx_except.h
-+\usr\include\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
-+\usr\include\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
-
- ..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
- ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
-
--..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
--..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
--..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
-+\usr\lib\libdb-4.2.so %_DEST%\lib%_EXT%\libdb-4.2.so
-+\usr\lib\libdb_java-4.2.so %_DEST%\lib%_EXT%\libdb_java-4.2.so
-+\usr\lib\libdb_cxx-4.2.so %_DEST%\lib%_EXT%\libdb_cxx-4.2.so
-
- ..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib
- ..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib
-@@ -18,5 +20,5 @@
- ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
- ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
-
--..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
-+\usr\share\java\db.jar %_DEST%\bin%_EXT%\db.jar
-
-diff -Nur oo.orig/config_office/makefile.rc oo.chng/config_office/makefile.rc
---- oo.orig/config_office/makefile.rc Mon Jul 7 16:46:29 2003
-+++ oo.chng/config_office/makefile.rc Wed Jul 30 19:05:47 2003
-@@ -159,7 +159,6 @@
- so3 \
- soltools \
- sot \
-- berkeleydb \
- starmath \
- stoc \
- store \
-diff -Nur oo.orig/scp/source/office/files.scp oo.chng/scp/source/office/files.scp
---- oo.orig/scp/source/office/files.scp Wed Jul 30 15:28:10 2003
-+++ oo.chng/scp/source/office/files.scp Wed Jul 30 19:09:56 2003
-@@ -983,7 +983,7 @@
- Styles = (PACKED);
- Dir = GID_DIR_PROGRAM;
- #ifdef UNX
-- Name = STRING(CONCAT2(libdb-3.2,UNXSUFFIX));
-+ Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
- #else
- Name = "libdb32.dll";
- #endif
-@@ -996,7 +996,7 @@
- Styles = (PACKED);
- Dir = GID_DIR_PROGRAM;
- #ifdef UNX
-- Name = STRING(CONCAT2(libdb_java-3.2,UNXSUFFIX));
-+ Name = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
- #else
- Name = "libdb_java32.dll";
- #endif
-@@ -1010,7 +1010,7 @@
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = GID_DIR_PROGRAM;
-- Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
-+ Name = STRING(CONCAT2(libdb_cxx-4.2,UNXSUFFIX));
- End
-
- #endif
-diff -Nur oo.orig/setup2/script/linux/1.0.0/webinstdb.inf oo.chng/setup2/script/linux/1.0.0/webinstdb.inf
---- oo.orig/setup2/script/linux/1.0.0/webinstdb.inf Thu May 24 08:45:47 2001
-+++ oo.chng/setup2/script/linux/1.0.0/webinstdb.inf Wed Jul 30 19:08:11 2003
-@@ -6687,7 +6687,7 @@
- End
-
- File gid_File_Lib_Db31
-- Name = "libdb-3.1.so";
-+ Name = "libdb-4.2.so";
- PackedName = "f_0352";
- Size = 458008;
- Dir = gid_Dir_Program;
-@@ -6700,7 +6700,7 @@
- End
-
- File gid_File_Lib_Dbjava31
-- Name = "libdb_java-3.1.so";
-+ Name = "libdb_java-4.2.so";
- PackedName = "f_0353";
- Size = 506820;
- Dir = gid_Dir_Program;
-diff -Nur oo.orig/setup2/script/linux/1.0.1/webinstdb.inf oo.chng/setup2/script/linux/1.0.1/webinstdb.inf
---- oo.orig/setup2/script/linux/1.0.1/webinstdb.inf Thu May 17 16:46:41 2001
-+++ oo.chng/setup2/script/linux/1.0.1/webinstdb.inf Wed Jul 30 19:08:31 2003
-@@ -7474,7 +7474,7 @@
- End
-
- File gid_File_Lib_Db31
-- Name = "libdb-3.1.so";
-+ Name = "libdb-4.2.so";
- PackedName = "f_0358";
- Size = 458008;
- DownloadSize = 196814;
-@@ -7488,7 +7488,7 @@
- End
-
- File gid_File_Lib_Dbjava31
-- Name = "libdb_java-3.1.so";
-+ Name = "libdb_java-4.2.so";
- PackedName = "f_0359";
- Size = 506820;
- DownloadSize = 212931;
-diff -Nur oo.orig/setup2/script/linux/1.1.1/webinstdb.inf oo.chng/setup2/script/linux/1.1.1/webinstdb.inf
---- oo.orig/setup2/script/linux/1.1.1/webinstdb.inf Wed Sep 19 14:58:58 2001
-+++ oo.chng/setup2/script/linux/1.1.1/webinstdb.inf Wed Jul 30 19:08:50 2003
-@@ -7512,7 +7512,7 @@
- End
-
- File gid_File_Lib_Db31
-- Name = "libdb-3.1.so";
-+ Name = "libdb-4.2.so";
- PackedName = "f_0361";
- Size = 458008;
- DownloadSize = 196814;
-@@ -7526,7 +7526,7 @@
- End
-
- File gid_File_Lib_Dbjava31
-- Name = "libdb_java-3.1.so";
-+ Name = "libdb_java-4.2.so";
- PackedName = "f_0362";
- Size = 506820;
- DownloadSize = 212931;
-diff -Nur oo.orig/solenv/inc/libs.mk oo.chng/solenv/inc/libs.mk
---- oo.orig/solenv/inc/libs.mk Wed Jul 30 15:28:09 2003
-+++ oo.chng/solenv/inc/libs.mk Wed Jul 30 19:11:20 2003
-@@ -176,8 +176,8 @@
- ZLIB3RDLIB=-lzlib
- JPEG3RDLIB=-ljpeglib
- NEON3RDLIB=-lneon
--BERKELEYLIB=-ldb-3.2
--BERKELEYCPPLIB=-ldb_cxx-3.2
-+BERKELEYLIB=-ldb-4.2
-+BERKELEYCPPLIB=-ldb_cxx-4.2
- CURLLIB=-lcurl
- SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
- SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
-diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/CreateDb.java oo.chng/xmlhelp/source/com/sun/star/help/CreateDb.java
---- oo.orig/xmlhelp/source/com/sun/star/help/CreateDb.java Mon Nov 20 13:08:42 2000
-+++ oo.chng/xmlhelp/source/com/sun/star/help/CreateDb.java Wed Jul 30 19:16:26 2003
-@@ -37,7 +37,7 @@
- table.set_errpfx( "HelpAccess" );
- try
- {
-- table.open( dbName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
-+ table.open( null,dbName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
- Dbc cursor = table.cursor( null,0 );
-
- StringDbt key = new StringDbt();
-@@ -131,7 +131,7 @@
- Db table = new Db(null, 0);
- table.set_error_stream(System.err);
- table.set_errpfx("AccessExample");
-- table.open("e:/rvp603b/help/helpaccess.db", null, Db.DB_HASH, Db.DB_CREATE, 0644);
-+ table.open(null,"e:/rvp603b/help/helpaccess.db", null, Db.DB_HASH, Db.DB_CREATE, 0644);
- StringDbt key = new StringDbt(key1);
- StringDbt data = new StringDbt(data1);
- try
-diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/HelpDatabases.java oo.chng/xmlhelp/source/com/sun/star/help/HelpDatabases.java
---- oo.orig/xmlhelp/source/com/sun/star/help/HelpDatabases.java Thu Mar 27 19:07:28 2003
-+++ oo.chng/xmlhelp/source/com/sun/star/help/HelpDatabases.java Wed Jul 30 19:18:28 2003
-@@ -239,7 +239,7 @@
- table = new Db( null,0 );
-
- String tablePath = _installDirectory + key + ".db";
-- table.open( tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
-+ table.open( null,tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
- _dbHash.put( key,table );
- }
- catch( DbException e )
-@@ -274,7 +274,7 @@
- table = new Db( null,0 );
-
- String tablePath = _installDirectory + key + ".ht";
-- table.open( tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
-+ table.open( null,tablePath,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
- _dbHash.put( key,table );
- }
- catch( DbException e )
-@@ -517,7 +517,7 @@
- String fileName = HelpDatabases.getInstallDirectory() + keyStr + ".key";
- Db table = new Db( null,0 );
- System.err.println( fileName );
-- table.open( fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
-+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
- Dbc cursor = table.cursor( null,0 );
- StringDbt key = new StringDbt();
- StringDbt data = new StringDbt();
-diff -Nur oo.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java oo.chng/xmlhelp/source/com/sun/star/help/HelpIndexer.java
---- oo.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java Thu Mar 27 19:07:28 2003
-+++ oo.chng/xmlhelp/source/com/sun/star/help/HelpIndexer.java Wed Jul 30 19:18:47 2003
-@@ -150,7 +150,7 @@
- + _module
- + ".db";
-
-- table.open( fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
-+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_RDONLY,0644 );
- Dbc cursor = table.cursor( null,0 );
- StringDbt key = new StringDbt();
- StringDbt data = new StringDbt();
-@@ -440,7 +440,7 @@
- + _module
- + ".key";
-
-- table.open( fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
-+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
-
- for( int i = 0; i < list.length; ++i )
- {
-@@ -481,7 +481,7 @@
- + _module
- + ".ht";
-
-- table.open( fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
-+ table.open( null,fileName,null,Db.DB_BTREE,Db.DB_CREATE,0644 );
-
- for( int i = 0; i < list.length; ++i )
- {
-diff -Nur oo.orig/xmlhelp/source/cxxhelp/provider/databases.cxx oo.chng/xmlhelp/source/cxxhelp/provider/databases.cxx
---- oo.orig/xmlhelp/source/cxxhelp/provider/databases.cxx Fri Apr 4 19:09:36 2003
-+++ oo.chng/xmlhelp/source/cxxhelp/provider/databases.cxx Wed Jul 30 19:23:11 2003
-@@ -60,7 +60,7 @@
- ************************************************************************/
-
-
--#include <berkeleydb/db_cxx.h>
-+#include <db_cxx.h>
- #ifndef _VOS_DIAGNOSE_HXX_
- #include <vos/diagnose.hxx>
- #endif
-@@ -497,7 +497,11 @@
-
- rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
-
-+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
-+ if( table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#else
- if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#endif
- {
- table->close( 0 );
- delete table;
-@@ -711,7 +715,12 @@
- osl_getThreadTextEncoding() );
-
- Db table(0,DB_CXX_NO_EXCEPTIONS);
-+
-+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
-+ if( 0 == table.open( NULL,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#else
- if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#endif
- {
- std::vector<KeywordInfo::KeywordElement> aVector;
- Db* idmap = getBerkeley( Database,Language );
-diff -Nur oo.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx oo.chng/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
---- oo.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Fri Jun 27 11:09:21 2003
-+++ oo.chng/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Wed Jul 30 19:07:08 2003
-@@ -94,7 +94,7 @@
- #include <sablot/shandler.h>
- #endif
- #ifndef _DB_CXX_H_
--#include <berkeleydb/db_cxx.h>
-+#include <db_cxx.h>
- #endif
- #ifndef _URLPARAMETER_HXX_
- #include <provider/urlparameter.hxx>
+++ /dev/null
---- oo_1.0_src/freetype/prj/d.lst.systemft Fri May 31 17:48:49 2002
-+++ oo_1.0_src/freetype/prj/d.lst Fri May 31 17:51:22 2002
-@@ -2,14 +2,13 @@
- mkdir: %_DEST%\inc%_EXT%\freetype\config
- mkdir: %_DEST%\inc%_EXT%\freetype\internal
-
--..\%__SRC%\inc\ft2build.h %_DEST%\inc%_EXT%\ft2build.h
--..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\freetype\*.h
--..\%__SRC%\inc\config\*.h %_DEST%\inc%_EXT%\freetype\config\*.h
--..\%__SRC%\inc\internal\*.h %_DEST%\inc%_EXT%\freetype\internal\*.h
-+\usr\include\ft2build.h %_DEST%\inc%_EXT%\ft2build.h
-+\usr\include\freetype2\freetype\*.h %_DEST%\inc%_EXT%\freetype\*.h
-+\usr\include\freetype2\freetype\config\*.h %_DEST%\inc%_EXT%\freetype\config\*.h
-+\usr\include\freetype2\freetype\internal\*.h %_DEST%\inc%_EXT%\freetype\internal\*.h
-
--..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.*
-+\usr\lib\libfreetype.so.* %_DEST%\lib%_EXT%\libfreetype.so.*
- ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
--..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-
- ..\%__SRC%\lib\freetype.lib %_DEST%\lib%_EXT%\freetype.lib
-
---- oo_1.0_src/freetype/makefile.mk.systemft Tue Feb 26 12:21:37 2002
-+++ oo_1.0_src/freetype/makefile.mk Fri May 31 17:48:37 2002
-@@ -65,6 +65,17 @@
- PRJNAME=so_freetype
- TARGET=so_freetype
-
-+# --- Hack to get system freetype ----------------------------------
-+.IF "$(GUI)"=="UNX"
-+all:
-+ @echo " An already available installation of freetype should exist on your system."
-+ @echo " Therefore the version provided here does not need to be built in addition."
-+
-+ +$(COPY) /usr$/lib$/libfreetype.so.6* $(DLLDEST)
-+ +$(COPY) -r /usr$/include$/freetype2$/freetype $(DLLDEST)$/..$/inc
-+ +$(COPY) -r /usr$/include$/ft2build.h $(DLLDEST)$/..$/inc$/freetype
-+.ENDIF
-+
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
-@@ -95,14 +106,12 @@
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_ACTION=$(GNUMAKE)
-
--OUT2LIB= \
-- objs$/.libs$/libfreetype.a
- .IF "$(OS)"=="MACOSX"
--OUT2LIB+=objs$/.libs$/libfreetype.*.dylib
-+OUT2LIB=objs$/.libs$/libfreetype.*.dylib
- .ELIF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
--OUT2LIB+=objs$/.libs$/libfreetype.so.9*
-+OUT2LIB=objs$/.libs$/libfreetype.so.9*
- .ELSE
--OUT2LIB+=objs$/.libs$/libfreetype.so.6*
-+OUT2LIB=objs$/.libs$/libfreetype.so.6*
- .ENDIF # "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-
- .ELSE # "$(GUI)"=="UNX"
---- oo_1.0.2_src.orig/solenv/inc/libs.mk Tue Jan 7 15:22:02 2003
-+++ oo_1.0.2_src/solenv/inc/libs.mk Thu Feb 13 17:29:26 2003
-@@ -131,7 +131,7 @@
- VCLLIBST=-lvcl
- VCLLIB=$(SVLIB)
- FREETYPELIB=-lfreetype
--FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC)
-+FREETYPELIBST=$(DYNAMIC) -lfreetype $(DYNAMIC)
- XPLIB=-l_xp
- TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
- SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
-
+++ /dev/null
---- oo_1.0_src/tools/bootstrp/addexes/makefile.mk.systemgo Sun Jun 2 19:50:01 2002
-+++ oo_1.0_src/tools/bootstrp/addexes/makefile.mk Sun Jun 2 19:50:11 2002
-@@ -98,7 +98,6 @@
- #APP3TARGET= ldump
- APP3STACK= 16000
- APP3OBJS= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
--APP3STDLIBS=gnu_getopt.lib
- APP3DEPN= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
-
- #APP4TARGET= readmap
---- oo_1.0_src/tools/bootstrp/cppdep.cxx.systemgo Wed Jun 13 15:43:51 2001
-+++ oo_1.0_src/tools/bootstrp/cppdep.cxx Sun Jun 2 19:29:10 2002
-@@ -64,18 +64,18 @@
-
- #ifdef WNT
- #ifdef BOOTSTRAPPER
--#include <glibc/posix/getopt.h>
-+#include <getopt.h>
- #else
--#include <glibc/getopt.h>
-+#include <getopt.h>
- #endif
- #endif
-
- #ifdef UNX
- #ifdef MACOSX
- #ifdef BOOTSTRAPPER
--#include <glibc/posix/getopt.h>
-+#include <getopt.h>
- #else
--#include <glibc/getopt.h>
-+#include <getopt.h>
- #endif
- #endif
- #include <unistd.h>
---- oo_1.0_src/external/glibc/sdfiles/makefile.mk.systemgo Sun Jun 2 19:47:20 2002
-+++ oo_1.0_src/external/glibc/sdfiles/makefile.mk Sun Jun 2 19:48:16 2002
-@@ -60,6 +60,13 @@
- #
- #*************************************************************************
-
-+# We use glibc. There's no need to dupe its functionality, especially not
-+# with legacy versions of known good code.
-+
-+all:
-+ @echo ignoring gnu_getopt
-+
-+
- PRJ=..$/..
-
- PRJNAME=3rdparty
---- oo_1.0_src/external/glibc/makefile.mk.systemgo Tue Nov 21 11:22:34 2000
-+++ oo_1.0_src/external/glibc/makefile.mk Sun Jun 2 19:29:10 2002
-@@ -60,6 +60,11 @@
- #
- #*************************************************************************
-
-+.IF "$(GUI)" == "UNX"
-+all:
-+ @echo "Assuming you already have glibc - no need to do anything."
-+.ENDIF
-+
- MAKEFILERC=yes
-
- .IF "$(OS)" == "WNT"
---- oo_1.0_src/external/prj/d.lst.systemgo Sun Jun 2 19:48:45 2002
-+++ oo_1.0_src/external/prj/d.lst Sun Jun 2 19:49:02 2002
-@@ -46,8 +46,6 @@
-
- ..\%__SRC%\slo\np* %_DEST%\lib%_EXT%\*
- ..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
--..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
--..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
- ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
- ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
- ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
+++ /dev/null
---- oo_1.0.2_src.orig/moz/prj/build.lst Thu Jun 21 08:09:26 2001
-+++ oo_1.0.2_src/moz/prj/build.lst Wed Feb 26 18:55:08 2003
-@@ -1,3 +1,3 @@
- moz moz : NULL
- moz moz usr1 - all moz_mkout NULL
--moz moz\zipped nmake - all moz_zipped NULL
-+
+++ /dev/null
---- oo_1.0.2_src.orig/solenv/inc/unxlngi4.mk Tue Jan 7 15:22:21 2003
-+++ oo_1.0.2_src/solenv/inc/unxlngi4.mk Thu Feb 13 17:18:06 2003
-@@ -202,7 +202,7 @@
- STDSHLCUIST=-ldl -lm
-
- LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+LIBSTLPORTST=$(DYNAMIC) -lstlport_gcc $(DYNAMIC)
-
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
---- oo_1.1rc3_src/solenv/inc/unxlngppc.mk.orig Mon Apr 28 16:47:14 2003
-+++ oo_1.1rc3_src/solenv/inc/unxlngppc.mk Wed Sep 3 10:03:39 2003
-@@ -189,7 +189,7 @@
- STDSHLCUIMT=-ldl -lpthread -lm
-
- LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+LIBSTLPORTST=$(DYNAMIC) -lstlport_gcc $(DYNAMIC)
-
- # name of library manager
- LIBMGR=ar
+++ /dev/null
---- oo_1.0.2_src/solenv/inc/unxlngppc.mk.orig Tue Jan 7 16:22:22 2003
-+++ oo_1.0.2_src/solenv/inc/unxlngppc.mk Mon Apr 14 23:07:23 2003
-@@ -128,7 +128,7 @@
- STDSHLCUIMT=-ldl -lpthread -lm
-
- LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+LIBSTLPORTST=$(DYNAMIC) -lstlport_gcc
-
- # name of library manager
- LIBMGR=ar
+++ /dev/null
---- oo_1.1rc3_src/scp/source/global/setupzip.scp.system-vera-fonts 2003-08-26 08:25:20.000000000 -0400
-+++ oo_1.1rc3_src/scp/source/global/setupzip.scp 2003-08-26 13:57:36.000000000 -0400
-@@ -575,7 +575,7 @@ File GID_FILE_LIB_FREETYPE
- End
- #endif
-
--#ifdef OSL_PRODUCT
-+#if 0
- STD_FONTUNX_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
- #endif
-
-@@ -590,10 +590,8 @@ File GID_FILE_LIB_ACCESSBRIDGE
- Name = "java_uno_accessbridge.dll";
- End
-
--#ifdef OSL_PRODUCT
--
-+#if 0
- STD_FONTWIN_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
--
- #endif
-
- #endif
---- oo_1.1rc3_src/scp/source/office/files.scp.system-vera-fonts 2003-08-25 18:56:01.000000000 -0400
-+++ oo_1.1rc3_src/scp/source/office/files.scp 2003-08-26 13:56:47.000000000 -0400
-@@ -2569,6 +2569,7 @@ STD_FONTUNX_FILE( GID_FILE_FNT_STARSYMB,
- #ifdef OSL_PRODUCT
-
- STD_FONTUNX_FILE( GID_FILE_FNT_OPENSYMB, opens___.ttf, OpenSymbol)
-+#if 0
- STD_FONTUNX_FILE( GID_FILE_FNT_VERABD, VeraBd.ttf, Vera Sans Bold)
- STD_FONTUNX_FILE( GID_FILE_FNT_VERABI, VeraBI.ttf, Vera Sans Bold Oblique)
- STD_FONTUNX_FILE( GID_FILE_FNT_VERAIT, VeraIt.ttf, Vera Sans Oblique)
-@@ -2578,6 +2579,7 @@ STD_FONTUNX_FILE( GID_FILE_FNT_VERAMOBI,
- STD_FONTUNX_FILE( GID_FILE_FNT_VERAMOIT, VeraMoIt.ttf, Vera Sans Mono Oblique)
- STD_FONTUNX_FILE( GID_FILE_FNT_VERASE, VeraSe.ttf, Vera Serif)
- STD_FONTUNX_FILE( GID_FILE_FNT_VERASEBD, VeraSeBd.ttf, Vera Serif Bold)
-+#endif
-
- #endif
-
-@@ -2714,6 +2716,7 @@ STD_FONTWIN_FILE( GID_FILE_FNT_STARSYMB,
- #ifdef OSL_PRODUCT
-
- STD_FONTWIN_FILE( GID_FILE_FNT_OPENSYMB, opens___.ttf, OpenSymbol)
-+#if 0
- STD_FONTWIN_FILE( GID_FILE_FNT_VERABD, VeraBd.ttf, Vera Sans Bold)
- STD_FONTWIN_FILE( GID_FILE_FNT_VERABI, VeraBI.ttf, Vera Sans Bold Italic)
- STD_FONTWIN_FILE( GID_FILE_FNT_VERAIT, VeraIt.ttf, Vera Sans Italic)
-@@ -2723,6 +2726,7 @@ STD_FONTWIN_FILE( GID_FILE_FNT_VERAMOBI,
- STD_FONTWIN_FILE( GID_FILE_FNT_VERAMOIT, VeraMoIt.ttf, Vera Sans Mono Italic)
- STD_FONTWIN_FILE( GID_FILE_FNT_VERASE, VeraSe.ttf, Vera Serif)
- STD_FONTWIN_FILE( GID_FILE_FNT_VERASEBD, VeraSeBd.ttf, Vera Serif Bold)
-+#endif
-
- #endif
-
+++ /dev/null
-diff -Nur oo.orig/crashrep/source/unx/makefile.mk oo.chng/crashrep/source/unx/makefile.mk
---- oo.orig/crashrep/source/unx/makefile.mk Wed Jul 16 16:05:44 2003
-+++ oo.chng/crashrep/source/unx/makefile.mk Wed Jul 30 19:44:14 2003
-@@ -115,7 +115,7 @@
- APP2TARGET=$(TARGET2)
- APP2OBJS=$(OBJFILES)
-
--APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
-+APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lz -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl
- .IF "$(OS)" == "SOLARIS"
- APP2STDLIBS+=-lsocket
- .ENDIF
-diff -Nur oo.orig/package/source/zipapi/Deflater.cxx oo.chng/package/source/zipapi/Deflater.cxx
---- oo.orig/package/source/zipapi/Deflater.cxx Thu Nov 15 21:16:11 2001
-+++ oo.chng/package/source/zipapi/Deflater.cxx Wed Jul 30 19:42:34 2003
-@@ -150,7 +150,7 @@
- pStream->avail_in = nLength;
- pStream->avail_out = nNewLength;
-
-- nResult = z_deflateParams(pStream, nLevel, nStrategy);
-+ nResult = deflateParams(pStream, nLevel, nStrategy);
- switch (nResult)
- {
- case Z_OK:
-@@ -174,7 +174,7 @@
- pStream->avail_in = nLength;
- pStream->avail_out = nNewLength;
-
-- nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
-+ nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
- switch (nResult)
- {
- case Z_STREAM_END:
-@@ -220,7 +220,7 @@
- {
- // do error handling
- }
-- sal_Int32 nResult = z_deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray()+nOffset, nLength);
-+ sal_Int32 nResult = deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray()+nOffset, nLength);
- }
- void SAL_CALL Deflater::setDictionary( const uno::Sequence< sal_Int8 >& rBuffer )
- {
-@@ -230,7 +230,7 @@
- VOS_DEBUG_ONLY("No stream!");
-
- }
-- sal_Int32 nResult = z_deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), rBuffer.getLength());
-+ sal_Int32 nResult = deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), rBuffer.getLength());
- }
- void SAL_CALL Deflater::setStrategy( sal_Int32 nNewStrategy )
- {
-@@ -295,7 +295,7 @@
- }
- void SAL_CALL Deflater::reset( )
- {
-- z_deflateReset(pStream);
-+ deflateReset(pStream);
- bFinish = sal_False;
- bFinished = sal_False;
- nOffset = nLength = 0;
-@@ -304,7 +304,7 @@
- {
- if (pStream != NULL)
- {
-- z_deflateEnd(pStream);
-+ deflateEnd(pStream);
- delete pStream;
- }
- pStream = NULL;
-diff -Nur oo.orig/package/source/zipapi/Inflater.cxx oo.chng/package/source/zipapi/Inflater.cxx
---- oo.orig/package/source/zipapi/Inflater.cxx Thu Nov 15 21:17:02 2001
-+++ oo.chng/package/source/zipapi/Inflater.cxx Wed Jul 30 19:43:20 2003
-@@ -133,7 +133,7 @@
- {
- // do error handling
- }
-- z_inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray() + nNewOffset,
-+ inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray() + nNewOffset,
- nNewLength);
- }
-
-@@ -143,7 +143,7 @@
- {
- // do error handling
- }
-- z_inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(),
-+ inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(),
- rBuffer.getLength());
- }
-
-@@ -202,7 +202,7 @@
-
- void SAL_CALL Inflater::reset( )
- {
-- z_inflateReset(pStream);
-+ inflateReset(pStream);
- bFinish = bNeedDict = bFinished = sal_False;
- nOffset = nLength = 0;
- }
-@@ -211,7 +211,7 @@
- {
- if (pStream != NULL)
- {
-- z_inflateEnd(pStream);
-+ inflateEnd(pStream);
- delete pStream;
- }
- pStream = NULL;
-@@ -225,7 +225,7 @@
- pStream->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset );
- pStream->avail_out = nNewLength;
-
-- nResult = ::z_inflate(pStream, bFinish ? Z_SYNC_FLUSH : Z_PARTIAL_FLUSH);
-+ nResult = ::inflate(pStream, bFinish ? Z_SYNC_FLUSH : Z_PARTIAL_FLUSH);
-
- switch (nResult)
- {
-diff -Nur oo.orig/solenv/inc/libs.mk oo.chng/solenv/inc/libs.mk
---- oo.orig/solenv/inc/libs.mk Wed Jul 30 19:35:35 2003
-+++ oo.chng/solenv/inc/libs.mk Wed Jul 30 19:41:03 2003
-@@ -173,7 +173,7 @@
- LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
- EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
- EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
--ZLIB3RDLIB=-lzlib
-+ZLIB3RDLIB=-lz
- JPEG3RDLIB=-ljpeglib
- NEON3RDLIB=-lneon
- BERKELEYLIB=-ldb-4.1
-diff -Nur oo.orig/zlib/prj/d.lst oo.chng/zlib/prj/d.lst
---- oo.orig/zlib/prj/d.lst Mon Aug 26 12:00:28 2002
-+++ oo.chng/zlib/prj/d.lst Wed Jul 30 19:40:21 2003
-@@ -1,10 +1,10 @@
- mkdir: %_DEST%\inc%_EXT%\external\zlib
-
--..\%__SRC%\inc\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
--..\%__SRC%\inc\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h
--..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
-+\usr\include\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
-+\usr\include\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h
-+\usr\include\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
-
--..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
-+\lib\libz.so* %_DEST%\lib%_EXT%\libz.so*
- ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
- ..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin
-
+++ /dev/null
-diff -Nur oo/berkeleydb/makefile.mk oo.new/berkeleydb/makefile.mk
---- oo/berkeleydb/makefile.mk Fri Feb 8 16:18:17 2002
-+++ oo.new/berkeleydb/makefile.mk Sun Apr 14 23:56:12 2002
-@@ -117,12 +117,12 @@
-
- .INCLUDE : set_ext.mk
- .INCLUDE : target.mk
--.INCLUDE : tg_ext.mk
-+#.INCLUDE : tg_ext.mk
-
--TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver
-- $(DELIVER)
-+#TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver
-+# $(DELIVER)
-
--.IF "$(BUILD_SOSL)"!=""
--ALLTAR : TG_DELIVER
--.ENDIF # "$(BUILD_SOSL)"!=""
-+#.IF "$(BUILD_SOSL)"!=""
-+#ALLTAR : TG_DELIVER
-+#.ENDIF # "$(BUILD_SOSL)"!=""
-
-diff -Nur oo/config_office/makefile.rc oo.new/config_office/makefile.rc
---- oo/config_office/makefile.rc Fri Oct 19 17:25:23 2001
-+++ oo.new/config_office/makefile.rc Sun Apr 14 23:56:12 2002
-@@ -155,7 +155,6 @@
- so3 \
- soltools \
- sot \
-- berkeleydb \
- starmath \
- stoc \
- store \
-diff -Nur oo/xmlhelp/source/cxxhelp/provider/databases.cxx oo.new/xmlhelp/source/cxxhelp/provider/databases.cxx
---- oo/xmlhelp/source/cxxhelp/provider/databases.cxx Fri Nov 23 17:51:01 2001
-+++ oo.new/xmlhelp/source/cxxhelp/provider/databases.cxx Mon Apr 15 10:59:50 2002
-@@ -60,7 +60,7 @@
- ************************************************************************/
-
-
--#include <berkeleydb/db_cxx.h>
-+#include <db_cxx.h>
- #ifndef _VOS_DIAGNOSE_HXX_
- #include <vos/diagnose.hxx>
- #endif
-diff -Nur oo/xmlhelp/source/cxxhelp/provider/urlparameter.cxx oo.new/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
---- oo/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Wed Oct 31 14:08:14 2001
-+++ oo.new/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Mon Apr 15 11:05:50 2002
-@@ -88,7 +88,7 @@
- #include <sablot/shandler.h>
- #endif
- #ifndef _DB_CXX_H_
--#include <berkeleydb/db_cxx.h>
-+#include <db_cxx.h>
- #endif
- #ifndef _URLPARAMETER_HXX_
- #include <provider/urlparameter.hxx>
---- oo_1.0_src/scp/source/office/files.scp.systemdb Fri May 31 17:43:01 2002
-+++ oo_1.0_src/scp/source/office/files.scp Fri May 31 17:43:37 2002
-@@ -994,7 +994,7 @@
- Styles = (PACKED);
- Dir = GID_DIR_PROGRAM;
- #ifdef UNX
-- Name = "libdb-3.2.so";
-+ Name = "libdb-3.1.so";
- #else
- Name = "libdb32.dll";
- #endif
-@@ -1007,7 +1007,7 @@
- Styles = (PACKED);
- Dir = GID_DIR_PROGRAM;
- #ifdef UNX
-- Name = "libdb_java-3.2.so";
-+ Name = "libdb_java-3.1.so";
- #else
- Name = "libdb_java32.dll";
- #endif
-@@ -1021,7 +1021,7 @@
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = GID_DIR_PROGRAM;
-- Name = "libdb_cxx-3.2.so";
-+ Name = "libdb_cxx-3.1.so";
- End
-
- #endif
---- oo_1.0_src/solenv/inc/libs.mk.systemdb Fri May 31 17:43:57 2002
-+++ oo_1.0_src/solenv/inc/libs.mk Fri May 31 17:45:32 2002
-@@ -174,8 +174,8 @@
- ZLIB3RDLIB=-lzlib
- JPEG3RDLIB=-ljpeglib
- NEON3RDLIB=-lneon
--BERKELEYLIB=-ldb-3.2
--BERKELEYCPPLIB=-ldb_cxx-3.2
-+BERKELEYLIB=-ldb-3.1
-+BERKELEYCPPLIB=-ldb_cxx-3.1
- CURLLIB=-lcurl
- SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
- SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
---- oo_1.0_src/berkeleydb/prj/d.lst.systemdb Fri May 31 17:38:58 2002
-+++ oo_1.0_src/berkeleydb/prj/d.lst Fri May 31 17:42:14 2002
-@@ -1,18 +1,17 @@
- mkdir: %_DEST%\inc%_EXT%\berkeleydb
-
--..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
--..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
--..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
-+\usr\include\db3\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
-+\usr\include\db3\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
-+\usr\include\db3\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
-
- ..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
- ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
-
--..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
--..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
--..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
-+\usr\lib\libdb-3.1.so %_DEST%\lib%_EXT%\libdb-3.1.so
-+\usr\lib\libdb_java-3.1.so %_DEST%\lib%_EXT%\libdb_java-3.1.so
-+\usr\lib\libdb_cxx-3.1.so %_DEST%\lib%_EXT%\libdb_cxx-3.1.so
-
- ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
- ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
-
--..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
-
---- oo_1.0_src/berkeleydb/makefile.mk.systemdb Fri May 31 17:34:42 2002
-+++ oo_1.0_src/berkeleydb/makefile.mk Fri May 31 17:38:51 2002
-@@ -65,6 +65,16 @@
- PRJNAME=so_berkeleydb
- TARGET=so_berkeleydb
-
-+# --- Hack to get system db libraries ------------------------------
-+.IF "$(GUI)"=="UNX"
-+all:
-+ @echo "Since you're running a real OS, we're assuming you have db..."
-+ +$(COPY) /usr$/lib$/libdb-3.1.so $(DLLDEST)
-+ +$(COPY) /usr$/lib$/libdb_cxx-3.1.so $(DLLDEST)
-+ +$(COPY) /usr$/lib$/libdb_java-3.1.so $(DLLDEST)
-+ +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
-+.ENDIF
-+
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
-diff -uNr xmlhelp.old/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/databases.cxx
---- oo/xmlhelp.old/source/cxxhelp/provider/databases.cxx Wed Dec 4 15:19:26 2002
-+++ oo/xmlhelp/source/cxxhelp/provider/databases.cxx Wed Dec 4 15:33:41 2002
-@@ -495,7 +495,11 @@
-
- rtl::OString fileName( fileNameOU.getStr(),fileNameOU.getLength(),osl_getThreadTextEncoding() );
-
-- if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
-+ if( table->open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#else
-+ if( table->open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#endif
- {
- table->close( 0 );
- delete table;
-@@ -709,7 +713,11 @@
- osl_getThreadTextEncoding() );
-
- Db table(0,DB_CXX_NO_EXCEPTIONS);
-+#if ((DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR) >= 41)
-+ if( 0 == table.open( NULL, fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#else
- if( 0 == table.open( fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) )
-+#endif
- {
- std::vector<KeywordInfo::KeywordElement> aVector;
- Db* idmap = getBerkeley( Database,Language );
+++ /dev/null
-01:en:ENUS:English US:english::en-US:
-03:pt:PORT:Portuguese:portuguese:por::
-07:ru:RUSS:Russian:russian:rus::
-30:el:GREEK:Greek:greek:gre::
-31:nl:DTCH:Dutch:dutch:dut::
-33:fr:FREN:French:french:fre::
-34:es:SPAN:Spanish:spanish:spa::
-35:fi:FINN:Finnish:finnish:fin::
-37:ca:CAT:Catalan:catalan:cat::
-39:it:ITAL:Italian:italian:ita::
-42:cs:CZECH:Czech:czech:cze::
-43:sk:SLOVAK:Slovak:slovak:slk::
-45:da:DAN:Danish:danish:dan::
-46:sv:SWED:Swedish:swedish:swe::
-48:pl:POL:Polish:polish:pol::
-49:de:GERM:German:german:ger::
-55:pt_BR:PORTBR:Brazilian:portuguese_brazilian::pt-BR:
-81:ja:JAPN:Japanese:japanese:jap::
-82:ko:KOREAN:Korean:korean:kor::
-86:zh_CN:CHINSIM:Chinese Simplified:chinese_simplified::zh-CN:
-88:zh_TW:CHINTRAD:Chinese Traditional:chinese_traditional::zh-TW:
-90:tr:TURK:Turkish:turkish:tur::
-96:ar:ARAB:Arabic:arabic:ara::
+++ /dev/null
-Index: sal/osl/unx/thread.c
-===================================================================
-RCS file: /cvs/oo/porting/sal/osl/unx/thread.c,v
-retrieving revision 1.21.8.1
-diff -u -p -u -r1.21.8.1 thread.c
---- sal/osl/unx/thread.c 25 Nov 2002 12:11:18 -0000 1.21.8.1
-+++ sal/osl/unx/thread.c 29 Apr 2003 12:16:53 -0000
-@@ -598,7 +598,9 @@ void SAL_CALL osl_waitThread(const TimeV
- /*****************************************************************************/
- void SAL_CALL osl_yieldThread()
- {
-- sched_yield();
-+#ifndef LINUX
-+ sched_yield();
-+#endif
- }
-
- /*****************************************************************************/
+++ /dev/null
-#!/usr/bin/perl
-
-use strict;
-use XML::Twig;
-
-my ($Language, $XMLFile) = (shift, shift);
-die "Invalid arguments" if (!$Language || !$XMLFile);
-
-#- Define localized help package name
-my $HelpPackage = "OpenOffice.org-help-$Language";
-
-my $t = XML::Twig->new(twig_roots => { "li" => \&handle_li },
- twig_print_outside_roots => 1,
- keep_encoding => 1,
- pretty_print => "indented"
- );
-
-$t->parsefile($XMLFile);
-{
- my $num_li = 0;
- sub handle_li {
- my ($t, $li) = @_;
- ++$num_li;
- # Only print the first item, aka "Help module is not installed"
- if ($num_li == 1) {
- # Implant OpenOffice.org help package name
- my @p = $t->descendants("p");
- (my $text = $p[1]->text()) =~ s/^([^.]+)/\1 (e.g. <b>${HelpPackage}<\/b>)/;
- $p[1]->set_text($text);
- # Don't print the help link
- foreach (@p) { $_->delete if ($_->descendants("help:link")) }
- $li->print;
- }
- }
-}
-
-# Local variables:
-# tab-width: 4
-# indent-tabs-mode: nil
-# End:
+++ /dev/null
-diff -uNr ooold/udm/inc/udm/tt_struct.hxx oonew/udm/inc/udm/tt_struct.hxx
---- ooold/udm/inc/udm/tt_struct.hxx Tue May 14 10:29:34 2002
-+++ oonew/udm/inc/udm/tt_struct.hxx Thu Aug 1 17:33:50 2002
-@@ -234,11 +234,11 @@
- };
-
-
--template <class SRC, class MEMBER_TYPE>
--TMemberInfo<SRC,MEMBER_TYPE>::TMemberInfo( ptr2member i_mpOriginalData )
-- : mpOriginalData(i_mpOriginalData)
--{
--}
-+//template <class SRC, class MEMBER_TYPE>
-+//TMemberInfo<SRC,MEMBER_TYPE>::TMemberInfo( ptr2member i_mpOriginalData )
-+// : mpOriginalData(i_mpOriginalData)
-+//{
-+//}
-
- template <class SRC, class MEMBER_TYPE>
- TMemberInfo<SRC,MEMBER_TYPE>::~TMemberInfo()
+++ /dev/null
---- dictionaries/en_US/makefile.mk-old 2003-09-24 13:09:06.000000000 +0200
-+++ dictionaries/en_US/makefile.mk 2003-09-24 13:09:24.000000000 +0200
-@@ -107,8 +107,8 @@
- #unzip the text input files
- $(MISC)$/th_en_US_words.txt: th_en_US_words.zip
- # cd is a 4nt internal command, we need a '+'
-- +cd $(MISC) && $(WRAPCMD) jar xf $(PWD)$/th_en_US_words.zip
-+ +cd $(MISC) && $(WRAPCMD) unzip -o $(PWD)$/th_en_US_words.zip
-
- $(MISC)$/th_en_US_thes.txt: th_en_US_thes.zip
- # ditto
-- +cd $(MISC) && $(WRAPCMD) jar xf $(PWD)$/th_en_US_thes.zip
-+ +cd $(MISC) && $(WRAPCMD) unzip -o $(PWD)$/th_en_US_thes.zip
+++ /dev/null
---- tools/source/solar/solar.c 15 Apr 2003 17:55:43 -0000 1.2
-+++ tools/source/solar/solar.c 22 Oct 2003 13:08:21 -0000
-@@ -58,17 +58,22 @@
- *
- *
- ************************************************************************/
--#include <stdio.h>
-
--#ifdef UNX
-+/* POSIX defines that a program is undefined after a SIG_SEGV. The
-+ * code stopped working on Linux Kernel 2.6 so I have moved this back to
-+ * use FORK.
-+ * If at a later time the signals work correctly with the Linux Kernel 2.6
-+ * then this change may be reverted although not strictly posix safe. */
-+#define USE_FORK_TO_CHECK 1
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <string.h>
-
- #include <unistd.h>
- #include <sys/types.h>
-
--#ifdef HPUX
--#include <stdlib.h>
--#endif
--
- #define I_STDARG
- #ifdef I_STDARG
- #include <stdarg.h>
-@@ -84,9 +89,6 @@
- #include <setjmp.h>
- #endif
-
--#else
--#endif
--
- #define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) )
-
- #define isSignedType(Type) (((Type)-1) < 0)
-@@ -133,7 +135,7 @@
-
- /*************************************************************************
- |*
--|* IsStackGrowingDown()
-+|* GetStackAlignment()
- |*
- |* Beschreibung Alignment von char Parametern, die (hoffentlich)
- |* ueber den Stack uebergeben werden
-@@ -176,8 +178,6 @@
- typedef int (*TestFunc)( Type, void* );
-
-
--#ifdef UNX
--
- /*************************************************************************
- |*
- |* PrintArgs()
-@@ -230,11 +230,11 @@
- void SignalHdl( int sig )
- {
- bSignal = 1;
-- /*
-+
- fprintf( stderr, "Signal %d caught\n", sig );
-- signal( sig, SignalHdl );
-- /**/
-- longjmp( check_env, sig );
-+ signal( SIGSEGV, SIG_DFL );
-+ signal( SIGBUS, SIG_DFL );
-+ siglongjmp( check_env, sig );
- }
- #endif
-
-@@ -270,7 +270,7 @@
-
- bSignal = 0;
-
-- if ( !setjmp( check_env ) )
-+ if ( !sigsetjmp( check_env, 0 ) )
- {
- signal( SIGSEGV, SignalHdl );
- signal( SIGBUS, SignalHdl );
-@@ -286,9 +286,6 @@
- #endif
- }
-
--#endif
--
--
- /*************************************************************************
- |*
- |* GetAtAddress()
-@@ -373,6 +370,7 @@
- int CheckSetAccess( Type eT, void* p )
- {
- int b;
-+
- b = -1 != check( (TestFunc)SetAtAddress, eT, p );
- #if OSL_DEBUG_LEVEL > 1
- fprintf( stderr,
-@@ -437,7 +435,7 @@
- |* Letzte Aenderung
- |*
- *************************************************************************/
--Description_Ctor( struct Description* pThis )
-+void Description_Ctor( struct Description* pThis )
- {
- pThis->bBigEndian = IsBigEndian();
- pThis->bStackGrowsDown = IsStackGrowingDown();
-@@ -468,16 +466,21 @@
- |* Letzte Aenderung
- |*
- *************************************************************************/
--Description_Print( struct Description* pThis, char* name )
-+void Description_Print( struct Description* pThis, char* name )
- {
- int i;
- FILE* f = fopen( name, "w" );
-+ if( ! f ) {
-+ fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) );
-+ exit( 99 );
-+ }
- fprintf( f, "#define __%s\n",
- pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" );
- for ( i = 0; i < 3; i++ )
- fprintf( f, "#define __ALIGNMENT%d\t%d\n",
-- 1 << i+1, pThis->nAlignment[i] );
-- fprintf( f, "#define __STACKALIGNMENT wird nicht benutzt\t%d\n", pThis->nStackAlignment );
-+ 1 << (i+1), pThis->nAlignment[i] );
-+ fprintf( f, "/* Stack alignment is not used... */\n" );
-+ fprintf( f, "#define __STACKALIGNMENT\t%d\n", pThis->nStackAlignment );
- fprintf( f, "#define __STACKDIRECTION\t%d\n",
- pThis->bStackGrowsDown ? -1 : 1 );
- fprintf( f, "#define __SIZEOFCHAR\t%d\n", sizeof( char ) );
-@@ -538,8 +541,12 @@
- printf( ( CheckGetAccess( eT, (long*)&a[i] ) ? "OK\n" : "ERROR\n" ) );
- }
- }
--
--main( int argc, char* argv[] )
-+/************************************************************************
-+ *
-+ * Use C code to determine the characteristics of the building platform.
-+ *
-+ ************************************************************************/
-+int main( int argc, char* argv[] )
- {
- printTypeSign( char, "char" );
- printTypeSign( short, "short" );
-@@ -574,7 +581,6 @@
- Description_Ctor( &description );
- Description_Print( &description, argv[1] );
- }
--
- {
- char* p = NULL;
- InfoMemoryAccess( p );
+++ /dev/null
---- vcl/util/makefile.mk.orig 2003-12-16 15:48:03.000000000 +0000
-+++ vcl/util/makefile.mk 2003-12-16 15:51:24.000000000 +0000
-@@ -294,7 +294,7 @@
- SHL1STDLIBS += -lXp -lXext -lSM -lICE -lX11
- .ELSE
- .IF "$(CPU)" == "I"
--SHL1STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic
-+SHL1STDLIBS += -Wl,-Bdynamic -lXinerama -Wl,-Bdynamic
- .ENDIF
- SHL1STDLIBS += -lXext -lSM -lICE -lX11
- .ENDIF # "$(USE_XPRINT)" == "TRUE"
+++ /dev/null
---- oo/vcl/unx/source/gdi/salgdi2.cxx.orig Fri May 23 18:44:38 2003
-+++ oo/vcl/unx/source/gdi/salgdi2.cxx Fri May 23 18:50:05 2003
-@@ -410,8 +410,8 @@
- Scanline mpScanAccess;
- sal_Int32 mnScanOffset;
-
-- sal_uInt32 ColorOf (BitmapColor& rColor) const;
-- sal_uInt8 GrayOf (BitmapColor& rColor) const;
-+ sal_uInt32 ColorOf (const BitmapColor& rColor) const;
-+ sal_uInt8 GrayOf (const BitmapColor& rColor) const;
-
- SalPrinterBmp ();
-
-@@ -536,7 +536,7 @@
- }
-
- sal_uInt32
--SalPrinterBmp::ColorOf (BitmapColor& rColor) const
-+SalPrinterBmp::ColorOf (const BitmapColor& rColor) const
- {
- if (rColor.IsIndex())
- return ColorOf (mpBmpBuffer->maPalette[rColor.GetIndex()]);
-@@ -547,7 +547,7 @@
- }
-
- sal_uInt8
--SalPrinterBmp::GrayOf (BitmapColor& rColor) const
-+SalPrinterBmp::GrayOf (const BitmapColor& rColor) const
- {
- if (rColor.IsIndex())
- return GrayOf (mpBmpBuffer->maPalette[rColor.GetIndex()]);
-@@ -573,7 +573,7 @@
- SalPrinterBmp::GetPixelRGB (sal_uInt32 nRow, sal_uInt32 nColumn) const
- {
- Scanline pScan = mpScanAccess + nRow * mnScanOffset;
-- BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
-+ const BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
-
- return ColorOf (aColor);
- }
-@@ -582,7 +582,7 @@
- SalPrinterBmp::GetPixelGray (sal_uInt32 nRow, sal_uInt32 nColumn) const
- {
- Scanline pScan = mpScanAccess + nRow * mnScanOffset;
-- BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
-+ const BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
-
- return GrayOf (aColor);
- }
-@@ -591,7 +591,7 @@
- SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const
- {
- Scanline pScan = mpScanAccess + nRow * mnScanOffset;
-- BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
-+ const BitmapColor& aColor = mpFncGetPixel (pScan, nColumn, mpBmpBuffer->maColorMask);
-
- if (aColor.IsIndex())
- return aColor.GetIndex();
+++ /dev/null
---- ucb/source/ucp/gvfs/content.hxx 2003-04-28 15:17:17.000000000 +0100
-+++ ucb/source/ucp/gvfs/content.hxx 2003-04-28 15:17:17.000000000 +0100
-@@ -0,0 +1,249 @@
-+#ifndef _GVFS_UCP_CONTENT_HXX
-+#define _GVFS_UCP_CONTENT_HXX
-+
-+#include <memory>
-+#include <list>
-+
-+#ifndef _RTL_REF_HXX_
-+#include <rtl/ref.hxx>
-+#endif
-+
-+#ifndef _COM_SUN_STAR_UCB_CONTENTCREATIONEXCEPTION_HPP_
-+#include <com/sun/star/ucb/ContentCreationException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_XCONTENTCREATOR_HPP_
-+#include <com/sun/star/ucb/XContentCreator.hpp>
-+#endif
-+
-+#ifndef _UCBHELPER_CONTENTHELPER_HXX
-+#include <ucbhelper/contenthelper.hxx>
-+#endif
-+
-+#include <glib/gthread.h>
-+#include <libgnomevfs/gnome-vfs-ops.h>
-+#include <libgnomevfs/gnome-vfs-directory.h>
-+
-+namespace com { namespace sun { namespace star { namespace beans {
-+ struct Property;
-+ struct PropertyValue;
-+} } } }
-+
-+namespace com { namespace sun { namespace star { namespace io {
-+ class XInputStream;
-+ class XOutputStream;
-+} } } }
-+
-+namespace com { namespace sun { namespace star { namespace sdbc {
-+ class XRow;
-+} } } }
-+
-+namespace com { namespace sun { namespace star { namespace ucb {
-+ struct TransferInfo;
-+} } } }
-+
-+namespace gvfs
-+{
-+
-+class ContentProvider;
-+class ContentProperties;
-+
-+// Random made up names - AFAICS
-+#define GVFS_FILE_TYPE "application/vnd.sun.staroffice.gvfs-file"
-+#define GVFS_FOLDER_TYPE "application/vnd.sun.staroffice.gvfs-folder"
-+
-+class Authentication
-+{
-+public:
-+ // Helper class to make exceptions pleasant
-+ Authentication( const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment > & xEnv );
-+ ~Authentication();
-+};
-+
-+class Content : public ::ucb::ContentImplHelper,
-+ public com::sun::star::ucb::XContentCreator
-+{
-+//=========================================================================
-+// Internals
-+//=========================================================================
-+private:
-+ typedef rtl::Reference< Content > ContentRef;
-+ typedef std::list< ContentRef > ContentRefList;
-+
-+ // Instance data
-+ ContentProvider *m_pProvider; // No need for a ref, base class holds object
-+ sal_Bool m_bTransient; // A non-existant (as yet) item
-+ GnomeVFSFileInfo m_info; // cached status information
-+
-+ // Internal helpers
-+ void queryChildren ( ContentRefList& rChildren );
-+ ::com::sun::star::uno::Any getBadArgExcept ();
-+ GnomeVFSResult getInfo ( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-+ sal_Bool isFolder ( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-+ sal_Bool exchangeIdentity( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XContentIdentifier >& xNewId);
-+ GnomeVFSResult doSetFileInfo ( const GnomeVFSFileInfo *newInfo,
-+ GnomeVFSSetFileInfoMask setMask,
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-+ ::rtl::OUString makeNewURL ( const char *newName );
-+ // End Internal helpers
-+
-+ // For ucbhelper
-+ virtual ::rtl::OUString getParentURL();
-+ // For ucbhelper
-+ virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
-+ getProperties( const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment > & xEnv );
-+ // For ucbhelper
-+ virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
-+ getCommands( const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment > & xEnv );
-+
-+public:
-+ // Command "getPropertyValues"
-+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
-+ getPropertyValues( const ::com::sun::star::uno::Sequence<
-+ ::com::sun::star::beans::Property >& rProperties,
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-+
-+private:
-+ // Command "setPropertyValues"
-+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
-+ setPropertyValues( const ::com::sun::star::uno::Sequence<
-+ ::com::sun::star::beans::PropertyValue >& rValues,
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-+
-+ // Command "insert"
-+ void insert( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream > & xInputStream,
-+ sal_Bool bReplaceExisting,
-+ const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( ::com::sun::star::uno::Exception );
-+
-+ // Command "transfer"
-+ void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs,
-+ const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( ::com::sun::star::uno::Exception );
-+
-+ // Command "delete"
-+ void destroy( sal_Bool bDeletePhysical )
-+ throw( ::com::sun::star::uno::Exception );
-+
-+ // "open" helpers
-+ void copyData( ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream > xIn,
-+ ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XOutputStream > xOut );
-+
-+ ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream >
-+ createTempStream( const ::com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( ::com::sun::star::uno::Exception );
-+ ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream >
-+ createInputStream( const ::com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( ::com::sun::star::uno::Exception );
-+ sal_Bool feedSink( ::com::sun::star::uno::Reference<
-+ ::com::sun::star::uno::XInterface> aSink,
-+ const ::com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& xEnv );
-+
-+ ::com::sun::star::uno::Any mapVFSException( const GnomeVFSResult result,
-+ sal_Bool bWrite );
-+
-+ void cancelCommandExecution(const GnomeVFSResult result,
-+ const ::com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment > & xEnv,
-+ sal_Bool bWrite = sal_False )
-+ throw( ::com::sun::star::uno::Exception );
-+
-+
-+public:
-+ // Non-interface bits
-+ char *getURI ();
-+ rtl::OString getOURI ();
-+ rtl::OUString getOUURI ();
-+
-+//=========================================================================
-+// Externals
-+//=========================================================================
-+public:
-+
-+ Content( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-+ ContentProvider *pProvider,
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XContentIdentifier >& Identifier)
-+ throw ( ::com::sun::star::ucb::ContentCreationException );
-+ Content( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-+ ContentProvider *pProvider,
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XContentIdentifier >& Identifier,
-+ sal_Bool isFolder)
-+ throw ( ::com::sun::star::ucb::ContentCreationException );
-+ virtual ~Content();
-+
-+ // XInterface
-+ XINTERFACE_DECL()
-+
-+ // XTypeProvider
-+ XTYPEPROVIDER_DECL()
-+
-+ // XServiceInfo
-+ virtual ::rtl::OUString SAL_CALL getImplementationName()
-+ throw( ::com::sun::star::uno::RuntimeException );
-+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-+ getSupportedServiceNames()
-+ throw( ::com::sun::star::uno::RuntimeException );
-+
-+ // XContent
-+ virtual rtl::OUString SAL_CALL
-+ getContentType()
-+ throw( com::sun::star::uno::RuntimeException );
-+
-+ // XCommandProcessor
-+ virtual com::sun::star::uno::Any SAL_CALL
-+ execute( const com::sun::star::ucb::Command& aCommand,
-+ sal_Int32 CommandId,
-+ const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( com::sun::star::uno::Exception,
-+ com::sun::star::ucb::CommandAbortedException,
-+ com::sun::star::uno::RuntimeException );
-+ virtual void SAL_CALL
-+ abort( sal_Int32 CommandId )
-+ throw( com::sun::star::uno::RuntimeException );
-+
-+ //////////////////////////////////////////////////////////////////////
-+ // Additional interfaces
-+ //////////////////////////////////////////////////////////////////////
-+
-+ // XContentCreator
-+ virtual com::sun::star::uno::Sequence<
-+ com::sun::star::ucb::ContentInfo > SAL_CALL
-+ queryCreatableContentsInfo()
-+ throw( com::sun::star::uno::RuntimeException );
-+ virtual com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XContent > SAL_CALL
-+ createNewContent( const com::sun::star::ucb::ContentInfo& Info )
-+ throw( com::sun::star::uno::RuntimeException );
-+};
-+
-+};
-+
-+extern "C" {
-+ extern GPrivate *auth_queue;
-+ extern void auth_queue_destroy( gpointer data );
-+};
-+
-+#endif
---- ucb/source/ucp/gvfs/content.cxx 2003-05-01 10:12:14.000000000 +0100
-+++ ucb/source/ucp/gvfs/content.cxx 2003-05-01 10:12:14.000000000 +0100
-@@ -0,0 +1,1702 @@
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <tools/datetime.hxx>
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HPP_
-+#include <com/sun/star/beans/PropertyValue.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
-+#include <com/sun/star/beans/PropertyAttribute.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_PROPERTYSETINFOCHANGE_HPP_
-+#include <com/sun/star/beans/PropertySetInfoChange.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_PROPERTYSETINFOCHANGEEVENT_HPP_
-+#include <com/sun/star/beans/PropertySetInfoChangeEvent.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XACTIVEDATASINK_HPP_
-+#include <com/sun/star/io/XActiveDataSink.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
-+#include <com/sun/star/io/XOutputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HPP_
-+#include <com/sun/star/lang/IllegalAccessException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_CONTENTINFOATTRIBUTE_HPP_
-+#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INSERTCOMMANDARGUMENT_HPP_
-+#include <com/sun/star/ucb/InsertCommandArgument.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFRERURLEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVEAUGMENTEDIOEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKCONNECTEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKGENBERALEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveNetworkGeneralException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKREADEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKRESOLVENAMEEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKWRITEEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_NAMECLASH_HPP_
-+#include <com/sun/star/ucb/NameClash.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_NAMECLASHEXCEPTION_HPP_
-+#include <com/sun/star/ucb/NameClashException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_OPENCOMMANDARGUMENT2_HPP_
-+#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_OPENMODE_HPP_
-+#include <com/sun/star/ucb/OpenMode.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_POSTCOMMANDARGUMENT2_HPP_
-+#include <com/sun/star/ucb/PostCommandArgument2.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_TRANSFERINFO_HPP_
-+#include <com/sun/star/ucb/TransferInfo.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_XCOMMANDINFO_HPP_
-+#include <com/sun/star/ucb/XCommandInfo.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_XPERSISTENTPROPERTYSET_HPP_
-+#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_MISSINGINPUTSTREAMEXCEPTION_HPP_
-+#include <com/sun/star/ucb/MissingInputStreamException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_MISSINGPROPERTIESEXCEPTION_HPP_
-+#include <com/sun/star/ucb/MissingPropertiesException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_UNSUPPORTEDCOMMANDEXCEPTION_HPP_
-+#include <com/sun/star/ucb/UnsupportedCommandException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_UNSUPPORTEDDATASINKEXCEPTION_HPP_
-+#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_UNSUPPORTEDNAMECLASHEXCEPTION_HPP_
-+#include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_UNSUPPORTEDOPENMODEEXCEPTION_HPP_
-+#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_UNSUPPORTEDOPENMODEEXCEPTION_HPP_
-+#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_NAMECLASHEXCEPTION_HPP_
-+#include <com/sun/star/ucb/NameClashException.hpp>
-+#endif
-+
-+#ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
-+#include <ucbhelper/contentidentifier.hxx>
-+#endif
-+#ifndef _UCBHELPER_PROPERTYVALUESET_HXX
-+#include <ucbhelper/propertyvalueset.hxx>
-+#endif
-+#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX
-+#include <ucbhelper/interactionrequest.hxx>
-+#endif
-+#ifndef _UCBHELPER_CANCELCOMMANDEXECUTION_HXX_
-+#include <ucbhelper/cancelcommandexecution.hxx>
-+#endif
-+#ifndef _UCBHELPER_SIMPLEAUTHENTICATIONREQUEST_HXX
-+#include <ucbhelper/simpleauthenticationrequest.hxx>
-+#endif
-+
-+const int TRANSFER_BUFFER_SIZE = 65536;
-+
-+/*
-+ * NB. Name escaping is done only for URIs
-+ * the 'Title' property is unescaped on set/get
-+ */
-+#include <libgnomevfs/gnome-vfs-utils.h>
-+#include <libgnomevfs/gnome-vfs-result.h>
-+#include <libgnomevfs/gnome-vfs-standard-callbacks.h>
-+extern "C" { // missing in the header: doh.
-+# include <libgnomevfs/gnome-vfs-module-callback.h>
-+}
-+
-+#include "content.hxx"
-+#include "provider.hxx"
-+#include "directory.hxx"
-+#include "stream.hxx"
-+
-+using namespace gvfs;
-+using namespace com::sun;
-+using namespace com::sun::star;
-+
-+#define CLEAR_INFO(info) memset((info), 0, sizeof ((info)[0]))
-+
-+
-+static char *
-+OUStringToGnome( const rtl::OUString &str )
-+{
-+ rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 );
-+ return g_strdup( (const sal_Char *) aTempStr );
-+}
-+
-+static rtl::OUString
-+GnomeToOUString( const char *utf8_str)
-+{
-+ if (!utf8_str)
-+ return rtl::OUString();
-+ else
-+ return rtl::OUString( utf8_str, strlen( utf8_str ), RTL_TEXTENCODING_UTF8 );
-+}
-+
-+
-+Content::Content(
-+ const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
-+ ContentProvider* pProvider,
-+ const uno::Reference< star::ucb::XContentIdentifier >& Identifier)
-+ throw ( star::ucb::ContentCreationException )
-+ : ContentImplHelper( rxSMgr, pProvider, Identifier ),
-+ m_pProvider( pProvider ),
-+ m_bTransient( sal_False )
-+{
-+ CLEAR_INFO (&m_info);
-+#ifdef DEBUG
-+ g_warning ("New Content ('%s')", getURI());
-+#endif
-+}
-+
-+Content::Content( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-+ ContentProvider *pProvider,
-+ const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XContentIdentifier >& Identifier,
-+ sal_Bool isFolder)
-+ throw ( ::com::sun::star::ucb::ContentCreationException )
-+ : ContentImplHelper( rxSMgr, pProvider, Identifier ),
-+ m_pProvider( pProvider ),
-+ m_bTransient( sal_True )
-+{
-+ CLEAR_INFO (&m_info);
-+
-+#ifdef DEBUG
-+ g_warning ("New Transient content ('%s') (%d)", getURI(), isFolder);
-+#endif
-+// m_info.name = FIXME: set name ?
-+ m_info.valid_fields = GNOME_VFS_FILE_INFO_FIELDS_TYPE;
-+ m_info.type = isFolder ? GNOME_VFS_FILE_TYPE_DIRECTORY :
-+ GNOME_VFS_FILE_TYPE_REGULAR;
-+}
-+
-+// virtual
-+Content::~Content()
-+{
-+ gnome_vfs_file_info_clear( &m_info );
-+}
-+
-+//
-+// XInterface methods.
-+//
-+
-+void SAL_CALL Content::acquire()
-+ throw( )
-+{
-+ ContentImplHelper::acquire();
-+}
-+void SAL_CALL Content::release()
-+ throw( )
-+{
-+ ContentImplHelper::release();
-+}
-+uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-+ throw ( uno::RuntimeException )
-+{
-+ // Note: isFolder may require network activities! So call it only
-+ // if it is really necessary!!!
-+ uno::Any aRet = cppu::queryInterface( rType,
-+ static_cast< star::ucb::XContentCreator * >( this ) );
-+ if ( aRet.hasValue() )
-+ return isFolder( uno::Reference< star::ucb::XCommandEnvironment >() )
-+ ? aRet : uno::Any();
-+ else
-+ return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
-+}
-+
-+//
-+// XTypeProvider methods.
-+//
-+
-+XTYPEPROVIDER_COMMON_IMPL( Content );
-+
-+uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-+ throw( uno::RuntimeException )
-+{
-+ static cppu::OTypeCollection *pFolderCollection = NULL;
-+ static cppu::OTypeCollection *pFileCollection = NULL;
-+
-+ if (!pFolderCollection) {
-+ osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-+
-+ if (!pFolderCollection) {
-+ static cppu::OTypeCollection aFolderCollection
-+ (CPPU_TYPE_REF( lang::XTypeProvider ),
-+ CPPU_TYPE_REF( lang::XServiceInfo ),
-+ CPPU_TYPE_REF( lang::XComponent ),
-+ CPPU_TYPE_REF( star::ucb::XContent ),
-+ CPPU_TYPE_REF( star::ucb::XCommandProcessor ),
-+ CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ),
-+ CPPU_TYPE_REF( star::ucb::XCommandInfoChangeNotifier ),
-+ CPPU_TYPE_REF( beans::XPropertyContainer ),
-+ CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ),
-+ CPPU_TYPE_REF( container::XChild ),
-+ CPPU_TYPE_REF( star::ucb::XContentCreator ) ); // !!
-+ static cppu::OTypeCollection aFileCollection
-+ (CPPU_TYPE_REF( lang::XTypeProvider ),
-+ CPPU_TYPE_REF( lang::XServiceInfo ),
-+ CPPU_TYPE_REF( lang::XComponent ),
-+ CPPU_TYPE_REF( star::ucb::XContent ),
-+ CPPU_TYPE_REF( star::ucb::XCommandProcessor ),
-+ CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ),
-+ CPPU_TYPE_REF( star::ucb::XCommandInfoChangeNotifier ),
-+ CPPU_TYPE_REF( beans::XPropertyContainer ),
-+ CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ),
-+ CPPU_TYPE_REF( container::XChild ) );
-+
-+ pFolderCollection = &aFolderCollection;
-+ pFileCollection = &aFileCollection;
-+ // FIXME: need write barrier from HEAD.
-+ }
-+ }
-+
-+ if ( isFolder( uno::Reference< star::ucb::XCommandEnvironment >() ) )
-+ return pFolderCollection->getTypes();
-+ else
-+ return pFileCollection->getTypes();
-+}
-+
-+//
-+// XServiceInfo methods.
-+//
-+
-+rtl::OUString SAL_CALL Content::getImplementationName()
-+ throw( uno::RuntimeException )
-+{
-+ return rtl::OUString::createFromAscii("com.sun.star.comp.GnomeVFSContent" );
-+}
-+
-+uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
-+ throw( uno::RuntimeException )
-+{
-+ uno::Sequence< rtl::OUString > aSNS( 1 );
-+ aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-+ "com.sun.star.ucb.GnomeVFSContent" );
-+ return aSNS;
-+}
-+
-+//
-+// XContent methods.
-+//
-+
-+rtl::OUString SAL_CALL Content::getContentType()
-+ throw( uno::RuntimeException )
-+{
-+ if ( isFolder( uno::Reference< star::ucb::XCommandEnvironment >() ) )
-+ return rtl::OUString::createFromAscii( GVFS_FOLDER_TYPE );
-+ else
-+ return rtl::OUString::createFromAscii( GVFS_FILE_TYPE );
-+}
-+
-+//
-+// XCommandProcessor methods.
-+//
-+
-+uno::Any Content::getBadArgExcept()
-+{
-+ return uno::makeAny( lang::IllegalArgumentException
-+ ( rtl::OUString::createFromAscii( "Wrong argument type!" ),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ -1 ) );
-+}
-+
-+uno::Any SAL_CALL Content::execute(
-+ const star::ucb::Command& aCommand,
-+ sal_Int32 CommandId,
-+ const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+ throw( uno::Exception,
-+ star::ucb::CommandAbortedException,
-+ uno::RuntimeException )
-+{
-+ uno::Any aRet;
-+
-+#ifdef DEBUG
-+ {
-+ uno::Reference< task::XInteractionHandler > xIH;
-+
-+ if ( xEnv.is() )
-+ xIH = xEnv->getInteractionHandler();
-+ g_warning( "Execute command: '%s' with %s interaction env",
-+ OUStringToGnome( aCommand.Name ),
-+ xIH.is() ? "" : "NO" );
-+ }
-+#endif
-+
-+#define COMMAND_IS(cmd,name) ( (cmd).Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( name ) ) )
-+
-+ if ( COMMAND_IS( aCommand, "getPropertyValues" ) ) {
-+ uno::Sequence< beans::Property > Properties;
-+
-+ if ( !( aCommand.Argument >>= Properties ) )
-+ ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-+
-+ aRet <<= getPropertyValues( Properties, xEnv );
-+
-+ } else if ( COMMAND_IS( aCommand, "setPropertyValues" ) ) {
-+ uno::Sequence< beans::PropertyValue > aProperties;
-+
-+ if ( !( aCommand.Argument >>= aProperties ) ||
-+ !aProperties.getLength() )
-+ ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-+
-+ aRet <<= setPropertyValues( aProperties, xEnv );
-+
-+ } else if ( COMMAND_IS( aCommand, "getPropertySetInfo" ) ) {
-+ aRet <<= getPropertySetInfo( xEnv, sal_False );
-+
-+ } else if ( COMMAND_IS( aCommand, "getCommandInfo" ) ) {
-+ aRet <<= getCommandInfo( xEnv, sal_False );
-+
-+ } else if ( COMMAND_IS( aCommand, "open" ) ) {
-+
-+ star::ucb::OpenCommandArgument2 aOpenCommand;
-+ if ( !( aCommand.Argument >>= aOpenCommand ) )
-+ ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-+
-+ sal_Bool bOpenFolder =
-+ ( ( aOpenCommand.Mode == star::ucb::OpenMode::ALL ) ||
-+ ( aOpenCommand.Mode == star::ucb::OpenMode::FOLDERS ) ||
-+ ( aOpenCommand.Mode == star::ucb::OpenMode::DOCUMENTS ) );
-+
-+ if ( bOpenFolder && isFolder( xEnv ) ) {
-+ uno::Reference< star::ucb::XDynamicResultSet > xSet
-+ = new DynamicResultSet(m_xSMgr, this, aOpenCommand, xEnv );
-+ aRet <<= xSet;
-+
-+ } else if ( aOpenCommand.Sink.is() ) {
-+
-+ if ( ( aOpenCommand.Mode
-+ == star::ucb::OpenMode::DOCUMENT_SHARE_DENY_NONE ) ||
-+ ( aOpenCommand.Mode
-+ == star::ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) {
-+ ucbhelper::cancelCommandExecution
-+ ( uno::makeAny ( star::ucb::UnsupportedOpenModeException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ sal_Int16( aOpenCommand.Mode ) ) ),
-+ xEnv );
-+ }
-+ if ( !feedSink( aOpenCommand.Sink, xEnv ) ) {
-+ // Note: aOpenCommand.Sink may contain an XStream
-+ // implementation. Support for this type of
-+ // sink is optional...
-+#ifdef DEBUG
-+ g_warning ("Failed to load data from '%s'", getURI());
-+#endif
-+ ucbhelper::cancelCommandExecution
-+ ( uno::makeAny (star::ucb::UnsupportedDataSinkException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ aOpenCommand.Sink ) ),
-+ xEnv );
-+ }
-+ }
-+#ifdef DEBUG
-+ else
-+ g_warning ("Open falling through ...");
-+#endif
-+
-+ } else if ( COMMAND_IS( aCommand, "insert" ) ) {
-+ star::ucb::InsertCommandArgument arg;
-+ if ( !( aCommand.Argument >>= arg ) )
-+ ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-+
-+ insert( arg.Data, arg.ReplaceExisting, xEnv );
-+
-+ } else if ( COMMAND_IS( aCommand, "delete" ) ) {
-+
-+ sal_Bool bDeletePhysical = sal_False;
-+ aCommand.Argument >>= bDeletePhysical;
-+
-+ ::rtl::OString aURI = getOURI();
-+ GnomeVFSResult result = gnome_vfs_unlink ((const sal_Char *) aURI);
-+
-+ if (result != GNOME_VFS_OK)
-+ cancelCommandExecution( result, xEnv, sal_True );
-+
-+ destroy( bDeletePhysical );
-+
-+ } else if ( COMMAND_IS( aCommand, "transfer" ) && isFolder( xEnv ) ) {
-+ star::ucb::TransferInfo transferArgs;
-+
-+ if ( !( aCommand.Argument >>= transferArgs ) )
-+ ucbhelper::cancelCommandExecution( getBadArgExcept(), xEnv );
-+
-+ transfer( transferArgs, xEnv );
-+
-+ } else { // Unsuported
-+#ifdef DEBUG
-+ g_warning( "Unsupported command: '%s'",
-+ OUStringToGnome( aCommand.Name ) );
-+#endif
-+ ucbhelper::cancelCommandExecution
-+ ( uno::makeAny( star::ucb::UnsupportedCommandException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ) ) ),
-+ xEnv );
-+ }
-+#undef COMMAND_IS
-+
-+ return aRet;
-+}
-+
-+void SAL_CALL Content::abort( sal_Int32 CommandId )
-+ throw( uno::RuntimeException )
-+{
-+ // FIXME: we should use the GnomeVFSCancellation APIs here ...
-+}
-+
-+//
-+// XContentCreator methods.
-+//
-+
-+uno::Sequence< star::ucb::ContentInfo > SAL_CALL
-+Content::queryCreatableContentsInfo()
-+ throw( uno::RuntimeException )
-+{
-+ uno::Sequence< star::ucb::ContentInfo > seq(2);
-+
-+ // Minimum set of props we really need
-+ uno::Sequence< beans::Property > props( 1 );
-+ props[0] = beans::Property(
-+ rtl::OUString::createFromAscii( "Title" ),
-+ -1,
-+ getCppuType( static_cast< rtl::OUString* >( 0 ) ),
-+ beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
-+
-+ // file
-+ seq[0].Type = rtl::OUString::createFromAscii( GVFS_FILE_TYPE );
-+ seq[0].Attributes = ( star::ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM |
-+ star::ucb::ContentInfoAttribute::KIND_DOCUMENT );
-+ seq[0].Properties = props;
-+
-+ // folder
-+ seq[1].Type = rtl::OUString::createFromAscii( GVFS_FOLDER_TYPE );
-+ seq[1].Attributes = star::ucb::ContentInfoAttribute::KIND_FOLDER;
-+ seq[1].Properties = props;
-+
-+ return seq;
-+}
-+
-+uno::Reference< star::ucb::XContent > SAL_CALL
-+Content::createNewContent( const star::ucb::ContentInfo& Info )
-+ throw( uno::RuntimeException )
-+{
-+ bool create_document;
-+ const char *name;
-+
-+ if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FILE_TYPE ) ) )
-+ create_document = true;
-+ else if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FOLDER_TYPE ) ) )
-+ create_document = false;
-+ else {
-+#ifdef DEBUG
-+ g_warning( "Failed to create new content '%s'",
-+ OUStringToGnome( Info.Type ) );
-+#endif
-+ return uno::Reference< star::ucb::XContent >();
-+ }
-+
-+#ifdef DEBUG
-+ g_warning( "createNewContent (%d)", (int) create_document );
-+#endif
-+
-+ rtl::OUString aURL = getOUURI();
-+
-+ if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-+ aURL += rtl::OUString::createFromAscii( "/" );
-+
-+ name = create_document ? "[New_Content]" : "[New_Collection]";
-+ // This looks problematic to me cf. webdav
-+ aURL += rtl::OUString::createFromAscii( name );
-+
-+ uno::Reference< star::ucb::XContentIdentifier > xId
-+ ( new ::ucb::ContentIdentifier( m_xSMgr, aURL ) );
-+
-+ try {
-+ return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document );
-+ } catch ( star::ucb::ContentCreationException & ) {
-+ return uno::Reference< star::ucb::XContent >();
-+ }
-+}
-+
-+rtl::OUString Content::getParentURL()
-+{
-+ rtl::OUString aParentURL;
-+ // <scheme>:// -> ""
-+ // <scheme>://foo -> ""
-+ // <scheme>://foo/ -> ""
-+ // <scheme>://foo/bar -> <scheme>://foo/
-+ // <scheme>://foo/bar/ -> <scheme>://foo/
-+ // <scheme>://foo/bar/abc -> <scheme>://foo/bar/
-+
-+ rtl::OUString aURL = getOUURI();
-+
-+ sal_Int32 nPos = aURL.lastIndexOf( '/' );
-+ if ( nPos == ( aURL.getLength() - 1 ) ) {
-+ // Trailing slash found. Skip.
-+ nPos = aURL.lastIndexOf( '/', nPos );
-+ }
-+
-+ sal_Int32 nPos1 = aURL.lastIndexOf( '/', nPos );
-+ if ( nPos1 != -1 )
-+ nPos1 = aURL.lastIndexOf( '/', nPos1 );
-+
-+ if ( nPos1 != -1 )
-+ aParentURL = rtl::OUString( aURL.copy( 0, nPos + 1 ) );
-+
-+#ifdef DEBUG
-+ g_warning ("getParentURL '%s' -> '%s'",
-+ getURI(), (const sal_Char *) rtl::OUStringToOString
-+ ( aParentURL, RTL_TEXTENCODING_UTF8 ) );
-+#endif
-+
-+ return aParentURL;
-+}
-+
-+static util::DateTime
-+getDateFromUnix (time_t t)
-+{
-+ static const Date epochStart( 1,1,1970 );
-+
-+ ::DateTime tmp;
-+ tmp.MakeDateTimeFromSec( epochStart, ((long unsigned int) t) );
-+
-+ return util::DateTime( 0, tmp.GetSec(), tmp.GetMin(), tmp.GetHour(),
-+ tmp.GetDay(), tmp.GetMonth (), tmp.GetYear ());
-+}
-+
-+uno::Reference< sdbc::XRow > Content::getPropertyValues(
-+ const uno::Sequence< beans::Property >& rProperties,
-+ const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+{
-+ int nProps;
-+ GnomeVFSResult result;
-+ uno::Sequence< beans::Property > allProperties;
-+
-+ if( ( result = getInfo( xEnv ) ) != GNOME_VFS_OK )
-+ cancelCommandExecution( result, xEnv, sal_False );
-+
-+ const beans::Property* pProps;
-+
-+ if( rProperties.getLength() ) {
-+ nProps = rProperties.getLength();
-+ pProps = rProperties.getConstArray();
-+ } else {
-+ allProperties = getPropertySetInfo( xEnv )->getProperties();
-+ nProps = allProperties.getLength();
-+ pProps = allProperties.getConstArray();
-+ }
-+
-+ rtl::Reference< ::ucb::PropertyValueSet > xRow
-+ = new ::ucb::PropertyValueSet( m_xSMgr );
-+
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+ for( sal_Int32 n = 0; n < nProps; ++n ) {
-+ const beans::Property& rProp = pProps[ n ];
-+
-+ if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) {
-+ if (m_info.name && m_info.name[0] == '/')
-+ g_warning ("Odd NFS title on item '%s' == '%s'",
-+ getURI(), m_info.name);
-+ xRow->appendString( rProp, GnomeToOUString( m_info.name ) );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
-+ xRow->appendString( rProp, getContentType () );
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) {
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE)
-+ xRow->appendBoolean( rProp, ( m_info.type == GNOME_VFS_FILE_TYPE_REGULAR ||
-+ m_info.type == GNOME_VFS_FILE_TYPE_UNKNOWN ) );
-+ else
-+ xRow->appendVoid( rProp );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) {
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE)
-+ xRow->appendBoolean( rProp, ( m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) );
-+ else
-+ xRow->appendVoid( rProp );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) {
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-+ xRow->appendLong( rProp, m_info.size );
-+ else
-+ xRow->appendVoid( rProp );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) ) {
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) {
-+ bool read_only = true;
-+
-+ if (m_info.uid == getuid () &&
-+ m_info.permissions & GNOME_VFS_PERM_USER_WRITE)
-+ read_only = false;
-+ else if (m_info.gid == getgid () &&
-+ m_info.permissions & GNOME_VFS_PERM_GROUP_WRITE)
-+ read_only = false;
-+ else if (m_info.permissions & GNOME_VFS_PERM_OTHER_WRITE)
-+ read_only = false;
-+ xRow->appendBoolean( rProp, read_only );
-+ } else
-+ xRow->appendVoid( rProp );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsHidden" ) ) )
-+ xRow->appendBoolean( rProp, ( m_info.name && m_info.name[0] == '.' ) );
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsVolume" ) ) ||
-+ rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsCompactDisk" ) ) )
-+ xRow->appendBoolean( rProp, sal_False );
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ) {
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_CTIME)
-+ xRow->appendTimestamp( rProp, getDateFromUnix( m_info.ctime ) );
-+ else
-+ xRow->appendVoid( rProp );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) {
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MTIME)
-+ xRow->appendTimestamp( rProp, getDateFromUnix( m_info.mtime ) );
-+ else
-+ xRow->appendVoid( rProp );
-+ }
-+
-+ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) {
-+ // We do this by sniffing in gnome-vfs; rather expensively.
-+#ifdef DEBUG
-+ g_warning ("FIXME: Requested mime-type - an expensive op. indeed!");
-+#endif
-+ xRow->appendVoid( rProp );
-+ } else {
-+ static int warn_count = 0;
-+ if (warn_count++ < 10)
-+ g_message ("Unknown property: '%s'",
-+ rtl::OUStringToOString( rProp.Name, RTL_TEXTENCODING_UTF8 ).getStr () );
-+ xRow->appendVoid( rProp );
-+ }
-+ }
-+#ifdef DEBUG
-+ g_warning ("getPropertyValues on '%s' %d properties returned (of %d)",
-+ getURI(), (int)xRow->getLength(), (int)nProps);
-+#endif
-+
-+ return uno::Reference< sdbc::XRow >( xRow.get() );
-+}
-+
-+static lang::IllegalAccessException
-+getReadOnlyException( Content *ctnt )
-+{
-+ return lang::IllegalAccessException
-+ ( rtl::OUString::createFromAscii( "Property is read-only!" ),
-+ static_cast< cppu::OWeakObject * >( ctnt ) );
-+}
-+
-+rtl::OUString
-+Content::makeNewURL( const char *newName )
-+{
-+ rtl::OUString aNewURL = getParentURL();
-+ if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
-+ aNewURL += rtl::OUString::createFromAscii( "/" );
-+
-+ char *name = gnome_vfs_escape_string( m_info.name );
-+ aNewURL += GnomeToOUString( name );
-+ g_free( name );
-+
-+ return aNewURL;
-+}
-+
-+// This is slightly complicated by needing to support either 'move' or 'setname'
-+GnomeVFSResult
-+Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo,
-+ GnomeVFSSetFileInfoMask setMask,
-+ const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+{
-+ GnomeVFSResult result = GNOME_VFS_OK;
-+
-+ g_assert (!m_bTransient);
-+
-+ ::rtl::OString aURI = getOURI();
-+
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+
-+ // The simple approach:
-+ if( setMask != GNOME_VFS_SET_FILE_INFO_NONE )
-+ result = gnome_vfs_set_file_info // missed a const in the API there
-+ ( (const sal_Char *) aURI, (GnomeVFSFileInfo *)newInfo, setMask );
-+
-+ if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED &&
-+ ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) ) {
-+ // Try a move instead
-+#ifdef DEBUG
-+ g_warning( "SetFileInfo not supported on '%s'", getURI() );
-+#endif
-+
-+ char *newURI = OUStringToGnome( makeNewURL( newInfo->name ) );
-+
-+ result = gnome_vfs_move ((const sal_Char *)aURI, newURI, FALSE);
-+
-+ g_free (newURI);
-+ }
-+
-+ return result;
-+}
-+
-+
-+uno::Sequence< uno::Any > Content::setPropertyValues(
-+ const uno::Sequence< beans::PropertyValue >& rValues,
-+ const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+{
-+ rtl::OUString aNewTitle;
-+ GnomeVFSFileInfo newInfo;
-+ int setMask = GNOME_VFS_SET_FILE_INFO_NONE;
-+
-+ getInfo( xEnv );
-+
-+ osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
-+
-+ gnome_vfs_file_info_copy( &newInfo, &m_info );
-+
-+ Authentication aAuth( xEnv );
-+
-+ int nChanged = 0, nTitlePos = 0;
-+ uno::Sequence< uno::Any > aRet( rValues.getLength() );
-+ uno::Sequence< beans::PropertyChangeEvent > aChanges( rValues.getLength() );
-+
-+ beans::PropertyChangeEvent aEvent;
-+ aEvent.Source = static_cast< cppu::OWeakObject * >( this );
-+ aEvent.Further = sal_False;
-+ aEvent.PropertyHandle = -1;
-+ // aEvent.PropertyName = fill in later ...
-+ // aEvent.OldValue =
-+ // aEvent.NewValue =
-+
-+ int nCount = rValues.getLength();
-+ const beans::PropertyValue* pValues = rValues.getConstArray();
-+
-+ for ( sal_Int32 n = 0; n < nCount; ++n ) {
-+ const beans::PropertyValue& rValue = pValues[ n ];
-+
-+#ifdef DEBUG
-+ g_warning( "Set prop '%s'", OUStringToGnome( rValue.Name ) );
-+#endif
-+ if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) ||
-+ rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ||
-+ rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ||
-+ rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ||
-+ rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
-+ aRet[ n ] <<= getReadOnlyException( this );
-+
-+ else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) ) {
-+ if ( rValue.Value >>= aNewTitle ) {
-+ if ( aNewTitle.getLength() <= 0 )
-+ aRet[ n ] <<= lang::IllegalArgumentException
-+ ( rtl::OUString::createFromAscii( "Empty title not allowed!" ),
-+ static_cast< cppu::OWeakObject * >( this ), -1 );
-+ else {
-+ char *newName = OUStringToGnome( aNewTitle );
-+
-+ if( !newName || !m_info.name || strcmp( newName, m_info.name ) ) {
-+#ifdef DEBUG
-+ g_warning ("Set new name to '%s'", newName);
-+#endif
-+
-+ aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
-+ aEvent.OldValue = uno::makeAny( GnomeToOUString( newInfo.name ) );
-+ aEvent.NewValue = uno::makeAny( aNewTitle );
-+ aChanges.getArray()[ nChanged ] = aEvent;
-+ nTitlePos = nChanged++;
-+
-+ newInfo.name = newName;
-+ setMask |= GNOME_VFS_SET_FILE_INFO_NAME;
-+ } else // same name
-+ g_free (newName);
-+ }
-+ } else
-+ aRet[ n ] <<= beans::IllegalTypeException
-+ ( rtl::OUString::createFromAscii( "Property value has wrong type!" ),
-+ static_cast< cppu::OWeakObject * >( this ) );
-+
-+ } else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ||
-+ rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) ) {
-+ // FIXME: should be able to set the timestamps
-+ aRet[ n ] <<= getReadOnlyException( this );
-+ } else {
-+#ifdef DEBUG
-+ g_warning( "Unhandled property '%s'", OUStringToGnome( rValue.Name ) );
-+#endif
-+ aRet[ n ] <<= getReadOnlyException( this );
-+ }
-+ }
-+
-+ GnomeVFSResult result = GNOME_VFS_OK;
-+
-+ if ( !m_bTransient &&
-+ ( result = doSetFileInfo( &newInfo,
-+ (GnomeVFSSetFileInfoMask) setMask,
-+ xEnv ) ) != GNOME_VFS_OK ) {
-+ for (int i = 0; i < nChanged; i++)
-+ aRet[ i ] <<= mapVFSException( result, sal_True );
-+
-+ }
-+
-+ if ( result == GNOME_VFS_OK) {
-+ gnome_vfs_file_info_copy( &m_info, &newInfo );
-+
-+ if ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) {
-+ uno::Reference< star::ucb::XContentIdentifier > xNewId
-+ = new ::ucb::ContentIdentifier( m_xSMgr, makeNewURL( newInfo.name ) );
-+
-+ aGuard.clear();
-+ if (!exchangeIdentity( xNewId ) )
-+ aRet[ nTitlePos ] <<= uno::Exception
-+ ( rtl::OUString::createFromAscii( "Exchange failed!" ),
-+ static_cast< cppu::OWeakObject * >( this ) );
-+ }
-+ }
-+
-+ gnome_vfs_file_info_clear( &newInfo );
-+
-+ if ( nChanged > 0 ) {
-+ aGuard.clear();
-+ aChanges.realloc( nChanged );
-+ notifyPropertiesChange( aChanges );
-+ }
-+
-+ return aRet;
-+}
-+
-+void Content::queryChildren( ContentRefList& rChildren )
-+{
-+ // Obtain a list with a snapshot of all currently instanciated contents
-+ // from provider and extract the contents which are direct children
-+ // of this content.
-+
-+ ::ucb::ContentRefList aAllContents;
-+ m_xProvider->queryExistingContents( aAllContents );
-+
-+ rtl::OUString aURL = getOUURI();
-+ sal_Int32 nPos = aURL.lastIndexOf( '/' );
-+
-+ if ( nPos != ( aURL.getLength() - 1 ) )
-+ aURL += rtl::OUString::createFromAscii( "/" );
-+
-+ sal_Int32 nLen = aURL.getLength();
-+
-+ ::ucb::ContentRefList::const_iterator it = aAllContents.begin();
-+ ::ucb::ContentRefList::const_iterator end = aAllContents.end();
-+
-+ while ( it != end ) {
-+ ::ucb::ContentImplHelperRef xChild = (*it);
-+ rtl::OUString aChildURL
-+ = xChild->getIdentifier()->getContentIdentifier();
-+
-+ // Is aURL a prefix of aChildURL?
-+ if ( ( aChildURL.getLength() > nLen ) &&
-+ ( aChildURL.compareTo( aURL, nLen ) == 0 ) ) {
-+ sal_Int32 nPos = nLen;
-+ nPos = aChildURL.indexOf( '/', nPos );
-+
-+ if ( ( nPos == -1 ) ||
-+ ( nPos == ( aChildURL.getLength() - 1 ) ) ) {
-+ // No further slashes / only a final slash. It's a child!
-+ rChildren.push_back( ::gvfs::Content::ContentRef
-+ (static_cast< ::gvfs::Content * >(xChild.getBodyPtr() ) ) );
-+ }
-+ }
-+ ++it;
-+ }
-+}
-+
-+void Content::insert(
-+ const uno::Reference< io::XInputStream > &xInputStream,
-+ sal_Bool bReplaceExisting,
-+ const uno::Reference< star::ucb::XCommandEnvironment > &xEnv )
-+ throw( uno::Exception )
-+{
-+ osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
-+
-+#ifdef DEBUG
-+ g_warning( "Insert '%s' (%d) (0x%x:%d)", getURI(), bReplaceExisting,
-+ m_info.valid_fields, m_info.type );
-+#endif
-+
-+ GnomeVFSResult result = getInfo( xEnv );
-+ // a racy design indeed.
-+ if( !bReplaceExisting && !m_bTransient &&
-+ result != GNOME_VFS_ERROR_NOT_FOUND) {
-+#ifdef DEBUG
-+ g_warning ("Nasty error inserting to '%s' ('%s')",
-+ getURI(), gnome_vfs_result_to_string( result ));
-+#endif
-+ cancelCommandExecution( GNOME_VFS_ERROR_FILE_EXISTS, xEnv, sal_True );
-+ }
-+
-+ if ( m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE &&
-+ m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) {
-+ ::rtl::OString aURI = getOURI();
-+ int perm;
-+
-+ perm = ( GNOME_VFS_PERM_USER_ALL |
-+ GNOME_VFS_PERM_GROUP_READ |
-+ GNOME_VFS_PERM_OTHER_READ );
-+
-+#ifdef DEBUG
-+ g_warning ("Make directory");
-+#endif
-+ result = gnome_vfs_make_directory( (const sal_Char *) aURI, perm );
-+
-+ if( result != GNOME_VFS_OK )
-+ cancelCommandExecution( result, xEnv, sal_True );
-+
-+ return;
-+ }
-+
-+ if ( !xInputStream.is() ) {
-+ // FIXME: slightly unclear whether to accept this and create an empty file
-+ ucbhelper::cancelCommandExecution
-+ ( uno::makeAny
-+ ( star::ucb::MissingInputStreamException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ) ) ),
-+ xEnv );
-+ }
-+
-+ GnomeVFSHandle *handle = NULL;
-+ ::rtl::OString aURI = getOURI();
-+
-+ result = GNOME_VFS_OK;
-+ if ( bReplaceExisting ) {
-+ Authentication aAuth( xEnv );
-+ result = gnome_vfs_open( &handle, (const sal_Char *)aURI,
-+ GNOME_VFS_OPEN_WRITE );
-+ }
-+
-+ if ( result != GNOME_VFS_OK ) {
-+ int perm;
-+ Authentication aAuth( xEnv );
-+
-+ perm = ( ( GNOME_VFS_PERM_USER_WRITE | GNOME_VFS_PERM_USER_READ ) |
-+ ( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) );
-+
-+ result = gnome_vfs_create
-+ ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_WRITE, TRUE, perm );
-+ }
-+
-+ if( result != GNOME_VFS_OK )
-+ cancelCommandExecution( result, xEnv, sal_True );
-+
-+ if ( !xInputStream.is() ) {
-+ result = gnome_vfs_close( handle );
-+ if (result != GNOME_VFS_OK)
-+ cancelCommandExecution( result, xEnv, sal_True );
-+
-+ } else { // copy it over
-+ uno::Reference < io::XOutputStream > xOutput =
-+ new gvfs::Stream( handle, &m_info );
-+
-+ copyData( xInputStream, xOutput );
-+ }
-+
-+ if (m_bTransient) {
-+ m_bTransient = sal_False;
-+ aGuard.clear();
-+ inserted();
-+ }
-+}
-+
-+void Content::transfer(const star::ucb::TransferInfo & rArgs,
-+ const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+ throw( uno::Exception )
-+{
-+ // FIXME: see gnome-vfs-xfer.h - but we need to be able to easily
-+ // detect which are gnome-vfs owned URI types ...
-+ ucbhelper::cancelCommandExecution
-+ ( uno::makeAny
-+ ( star::ucb::InteractiveBadTransferURLException
-+ ( rtl::OUString::createFromAscii( "Unsupported URL scheme!" ),
-+ static_cast< cppu::OWeakObject * >( this ) ) ),
-+ xEnv );
-+}
-+
-+void Content::destroy( sal_Bool bDeletePhysical )
-+ throw( uno::Exception )
-+{
-+ // @@@ take care about bDeletePhysical -> trashcan support
-+ rtl::OUString aURL = getOUURI();
-+
-+ uno::Reference< star::ucb::XContent > xThis = this;
-+
-+ deleted();
-+
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+
-+ // Process instanciated children...
-+ ::gvfs::Content::ContentRefList aChildren;
-+ queryChildren( aChildren );
-+
-+ ContentRefList::const_iterator it = aChildren.begin();
-+ ContentRefList::const_iterator end = aChildren.end();
-+
-+ while ( it != end ) {
-+ (*it)->destroy( bDeletePhysical );
-+ ++it;
-+ }
-+}
-+
-+// Used by the 'setPropertyValues' method for
-+// propagating the renaming of a Content.
-+sal_Bool Content::exchangeIdentity(
-+ const uno::Reference< star::ucb::XContentIdentifier >& xNewId )
-+{
-+ if ( !xNewId.is() )
-+ return sal_False;
-+
-+ uno::Reference< star::ucb::XContent > xThis = this;
-+
-+#ifdef DEBUG
-+ g_warning( "exchangeIdentity from '%s' to '%s'",
-+ getURI(), OUStringToGnome( xNewId->getContentIdentifier() ) );
-+#endif
-+
-+ if ( m_bTransient ) {
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+ /* FIXME: can we not screw up an identically named
-+ * Content pointing to ourself here ? */
-+ m_xIdentifier = xNewId;
-+ return sal_False;
-+ }
-+
-+ rtl::OUString aOldURL = getOUURI();
-+
-+ // Exchange own identitity.
-+ if ( exchange( xNewId ) ) {
-+
-+ // Process instanciated children...
-+ ContentRefList aChildren;
-+ queryChildren( aChildren );
-+
-+ ContentRefList::const_iterator it = aChildren.begin();
-+ ContentRefList::const_iterator end = aChildren.end();
-+
-+ while ( it != end ) {
-+ ContentRef xChild = (*it);
-+
-+ // Create new content identifier for the child...
-+ uno::Reference< star::ucb::XContentIdentifier >
-+ xOldChildId = xChild->getIdentifier();
-+ rtl::OUString aOldChildURL
-+ = xOldChildId->getContentIdentifier();
-+ rtl::OUString aNewChildURL
-+ = aOldChildURL.replaceAt(
-+ 0,
-+ aOldURL.getLength(),
-+ xNewId->getContentIdentifier() );
-+ uno::Reference< star::ucb::XContentIdentifier >
-+ xNewChildId
-+ = new ::ucb::ContentIdentifier( m_xSMgr, aNewChildURL );
-+
-+ if ( !xChild->exchangeIdentity( xNewChildId ) )
-+ return sal_False;
-+
-+ ++it;
-+ }
-+ return sal_True;
-+ }
-+
-+ return sal_False;
-+}
-+
-+GnomeVFSResult
-+Content::getInfo( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+{
-+ GnomeVFSResult result;
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+
-+ if (m_bTransient)
-+ result = GNOME_VFS_OK;
-+
-+ else if ( !m_info.valid_fields ) {
-+ ::rtl::OString aURI = getOURI();
-+ Authentication aAuth( xEnv );
-+ result = gnome_vfs_get_file_info
-+ ( (const sal_Char *)aURI, &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
-+ if (result != GNOME_VFS_OK)
-+ gnome_vfs_file_info_clear( &m_info );
-+ } else
-+ result = GNOME_VFS_OK;
-+#ifdef DEBUG
-+ g_warning( "getInfo on '%s' returns '%s' (%d) (0x%x)",
-+ getURI(), gnome_vfs_result_to_string( result ),
-+ result, m_info.valid_fields );
-+#endif
-+ return result;
-+}
-+
-+sal_Bool
-+Content::isFolder(const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+ getInfo( xEnv );
-+ return (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE &&
-+ m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY);
-+}
-+
-+uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite )
-+{
-+ uno::Any aException;
-+ const char *gvfs_message;
-+ rtl::OUString message;
-+ uno::Sequence< uno::Any > aArgs( 1 );
-+
-+#ifdef DEBUG
-+ g_warning ("Map VFS exception '%s' (%d)",
-+ gnome_vfs_result_to_string( result ), result );
-+#endif
-+
-+ if ((gvfs_message = gnome_vfs_result_to_string (result)))
-+ message = GnomeToOUString( gvfs_message );
-+
-+ switch (result) {
-+ case GNOME_VFS_OK:
-+ g_error ("VFS_OK mapped to exception.");
-+ break;
-+ case GNOME_VFS_ERROR_EOF:
-+ g_warning ("VFS_EOF not handled somewhere.");
-+ break;
-+ case GNOME_VFS_ERROR_NOT_FOUND:
-+ aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier();
-+ aException <<=
-+ star::ucb::InteractiveAugmentedIOException
-+ ( rtl::OUString::createFromAscii( "Not found!" ),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR,
-+ star::ucb::IOErrorCode_NOT_EXISTING,
-+ aArgs );
-+ break;
-+ case GNOME_VFS_ERROR_BAD_PARAMETERS:
-+ aException <<=
-+ lang::IllegalArgumentException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ -1 );
-+ break;
-+ case GNOME_VFS_ERROR_GENERIC:
-+ case GNOME_VFS_ERROR_INTERNAL:
-+ case GNOME_VFS_ERROR_NOT_SUPPORTED:
-+#ifdef DEBUG
-+ g_warning ("Internal - un-mapped error");
-+#endif
-+ aException <<= io::IOException();
-+ break;
-+ case GNOME_VFS_ERROR_IO:
-+ if ( bWrite )
-+ aException <<=
-+ star::ucb::InteractiveNetworkWriteException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR,
-+ message );
-+ else
-+ aException <<=
-+ star::ucb::InteractiveNetworkReadException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR,
-+ message );
-+ break;
-+ case GNOME_VFS_ERROR_HOST_NOT_FOUND:
-+ case GNOME_VFS_ERROR_INVALID_HOST_NAME:
-+ aException <<=
-+ star::ucb::InteractiveNetworkResolveNameException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR,
-+ message );
-+ break;
-+ case GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE:
-+ case GNOME_VFS_ERROR_SERVICE_OBSOLETE:
-+ case GNOME_VFS_ERROR_PROTOCOL_ERROR:
-+ case GNOME_VFS_ERROR_NO_MASTER_BROWSER:
-+ aException <<=
-+ star::ucb::InteractiveNetworkConnectException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR,
-+ message );
-+ break;
-+
-+ case GNOME_VFS_ERROR_FILE_EXISTS:
-+ aException <<= star::ucb::NameClashException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR,
-+ message );
-+ break;
-+
-+ case GNOME_VFS_ERROR_INVALID_OPEN_MODE:
-+ aException <<= star::ucb::UnsupportedOpenModeException();
-+ break;
-+
-+ case GNOME_VFS_ERROR_CORRUPTED_DATA:
-+ case GNOME_VFS_ERROR_WRONG_FORMAT:
-+ case GNOME_VFS_ERROR_BAD_FILE:
-+ case GNOME_VFS_ERROR_TOO_BIG:
-+ case GNOME_VFS_ERROR_NO_SPACE:
-+ case GNOME_VFS_ERROR_READ_ONLY:
-+ case GNOME_VFS_ERROR_INVALID_URI:
-+ case GNOME_VFS_ERROR_NOT_OPEN:
-+ case GNOME_VFS_ERROR_ACCESS_DENIED:
-+ case GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES:
-+ case GNOME_VFS_ERROR_NOT_A_DIRECTORY:
-+ case GNOME_VFS_ERROR_IN_PROGRESS:
-+ case GNOME_VFS_ERROR_INTERRUPTED:
-+ case GNOME_VFS_ERROR_LOOP:
-+ case GNOME_VFS_ERROR_NOT_PERMITTED:
-+ case GNOME_VFS_ERROR_IS_DIRECTORY:
-+ case GNOME_VFS_ERROR_NO_MEMORY:
-+ case GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS:
-+ case GNOME_VFS_ERROR_LOGIN_FAILED:
-+ case GNOME_VFS_ERROR_CANCELLED:
-+ case GNOME_VFS_ERROR_DIRECTORY_BUSY:
-+ case GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY:
-+ case GNOME_VFS_ERROR_TOO_MANY_LINKS:
-+ case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM:
-+ case GNOME_VFS_ERROR_NOT_SAME_FILE_SYSTEM:
-+ case GNOME_VFS_ERROR_NAME_TOO_LONG:
-+#ifdef DEBUG
-+ g_warning( "FIXME: Un-mapped VFS exception '%s' (%d)",
-+ gnome_vfs_result_to_string( result ), result );
-+#endif
-+ default:
-+ aException <<= star::ucb::InteractiveNetworkGeneralException
-+ ( rtl::OUString(),
-+ static_cast< cppu::OWeakObject * >( this ),
-+ task::InteractionClassification_ERROR );
-+ break;
-+ }
-+
-+ return aException;
-+}
-+
-+void Content::cancelCommandExecution(
-+ GnomeVFSResult result,
-+ const uno::Reference< star::ucb::XCommandEnvironment > & xEnv,
-+ sal_Bool bWrite /* = sal_False */ )
-+ throw ( uno::Exception )
-+{
-+ ucbhelper::cancelCommandExecution( mapVFSException( result, bWrite ), xEnv );
-+ // Unreachable
-+}
-+
-+uno::Sequence< beans::Property > Content::getProperties(
-+ const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-+{
-+ static const beans::Property aGenericProperties[] = {
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
-+ -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
-+ -1, getCppuBooleanType(),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
-+ -1, getCppuBooleanType(),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
-+ -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-+ beans::PropertyAttribute::BOUND ),
-+ // Optional ...
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ),
-+ -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ),
-+ -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+// FIXME: Too expensive for now (?)
-+// beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ),
-+// -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
-+// beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ),
-+ -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ) ),
-+ -1, getCppuBooleanType(),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVolume" ) ),
-+ -1, getCppuBooleanType(),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCompactDisk" ) ),
-+ -1, getCppuBooleanType(),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-+ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ),
-+ -1, getCppuBooleanType(),
-+ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY )
-+ };
-+
-+ const int nProps = sizeof (aGenericProperties) / sizeof (aGenericProperties[0]);
-+
-+ return uno::Sequence< beans::Property > ( aGenericProperties, nProps );
-+
-+}
-+
-+uno::Sequence< com::sun::star::ucb::CommandInfo > Content::getCommands(
-+ const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv )
-+{
-+ static com::sun::star::ucb::CommandInfo aDocumentCommandInfoTable[] = {
-+ // Required commands
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
-+ -1, getCppuVoidType() ),
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
-+ -1, getCppuVoidType() ),
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
-+ -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
-+ -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
-+
-+ // Optional standard commands
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ),
-+ -1, getCppuBooleanType() ),
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ),
-+ -1, getCppuType( static_cast<com::sun::star::ucb::InsertCommandArgument * >( 0 ) ) ),
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
-+ -1, getCppuType( static_cast<com::sun::star::ucb::OpenCommandArgument2 * >( 0 ) ) ),
-+
-+ // Folder only
-+ com::sun::star::ucb::CommandInfo
-+ ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ),
-+ -1, getCppuType( static_cast<com::sun::star::ucb::TransferInfo * >( 0 ) ) )
-+ };
-+ int num = 7;
-+
-+ if ( isFolder( xEnv ) )
-+ num += 1;
-+
-+ return uno::Sequence< com::sun::star::ucb::CommandInfo >(aDocumentCommandInfoTable, num );
-+}
-+
-+rtl::OUString
-+Content::getOUURI ()
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+ return m_xIdentifier->getContentIdentifier();
-+}
-+
-+rtl::OString
-+Content::getOURI ()
-+{
-+ return rtl::OUStringToOString( getOUURI(), RTL_TEXTENCODING_UTF8 );
-+}
-+
-+char *
-+Content::getURI ()
-+{
-+ return OUStringToGnome( getOUURI() );
-+}
-+
-+void
-+Content::copyData( ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream > xIn,
-+ ::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XOutputStream > xOut )
-+{
-+ uno::Sequence< sal_Int8 > theData( TRANSFER_BUFFER_SIZE );
-+
-+ g_return_if_fail( xIn.is() && xOut.is() );
-+
-+ while ( xIn->readBytes( theData, TRANSFER_BUFFER_SIZE ) > 0 )
-+ xOut->writeBytes( theData );
-+
-+ xOut->closeOutput();
-+}
-+
-+// Inherits an authentication context
-+::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream >
-+Content::createTempStream( const ::com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( ::com::sun::star::uno::Exception )
-+{
-+ GnomeVFSResult result;
-+ GnomeVFSHandle *handle = NULL;
-+ ::rtl::OString aURI = getOURI();
-+
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+ // Something badly wrong happened - can't seek => stream to a temporary file
-+ const rtl::OUString sServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.io.TempFile" ) );
-+ uno::Reference < io::XOutputStream > xTempOut =
-+ uno::Reference < io::XOutputStream >
-+ ( m_xSMgr->createInstance( sServiceName ), uno::UNO_QUERY );
-+
-+ if ( !xTempOut.is() )
-+ cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
-+
-+ result = gnome_vfs_open
-+ ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_READ );
-+ if (result != GNOME_VFS_OK)
-+ cancelCommandExecution( result, xEnv );
-+
-+ uno::Reference < io::XInputStream > pStream = new ::gvfs::Stream( handle, &m_info );
-+ copyData( pStream, xTempOut );
-+
-+ return uno::Reference < io::XInputStream > ( xTempOut, uno::UNO_QUERY );
-+}
-+
-+::com::sun::star::uno::Reference<
-+ ::com::sun::star::io::XInputStream >
-+Content::createInputStream( const ::com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv )
-+ throw( ::com::sun::star::uno::Exception )
-+{
-+ GnomeVFSHandle *handle = NULL;
-+ GnomeVFSResult result;
-+ uno::Reference<io::XInputStream > xIn;
-+
-+ Authentication aAuth( xEnv );
-+ osl::Guard< osl::Mutex > aGuard( m_aMutex );
-+
-+ getInfo( xEnv );
-+ ::rtl::OString aURI = getOURI();
-+
-+ if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) )
-+ return createTempStream( xEnv );
-+
-+ result = gnome_vfs_open
-+ ( &handle, (const sal_Char *)aURI,
-+ (GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) );
-+
-+ if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE ||
-+ result == GNOME_VFS_ERROR_NOT_SUPPORTED)
-+ return createTempStream( xEnv );
-+
-+ if (result != GNOME_VFS_OK)
-+ cancelCommandExecution( result, xEnv );
-+
-+ // Try a seek just to make sure it's Random access: some lie.
-+ result = gnome_vfs_seek( handle, GNOME_VFS_SEEK_START, 0);
-+ if (result == GNOME_VFS_ERROR_NOT_SUPPORTED) {
-+ gnome_vfs_close( handle );
-+ return createTempStream( xEnv );
-+ }
-+
-+ if (result != GNOME_VFS_OK)
-+ cancelCommandExecution( result, xEnv );
-+
-+ if (handle != NULL)
-+ xIn = new ::gvfs::Stream( handle, &m_info );
-+
-+ return xIn;
-+}
-+
-+sal_Bool
-+Content::feedSink( uno::Reference< ::com::sun::star::uno::XInterface > aSink,
-+ const uno::Reference< star::ucb::XCommandEnvironment >& xEnv )
-+{
-+ if ( !aSink.is() )
-+ return sal_False;
-+
-+ uno::Reference< io::XOutputStream > xOut
-+ = uno::Reference< io::XOutputStream >(aSink, uno::UNO_QUERY );
-+ uno::Reference< io::XActiveDataSink > xDataSink
-+ = uno::Reference< io::XActiveDataSink >(aSink, uno::UNO_QUERY );
-+
-+ if ( !xOut.is() && !xDataSink.is() )
-+ return sal_False;
-+
-+ uno::Reference< io::XInputStream > xIn = createInputStream( xEnv );
-+ if ( !xIn.is() )
-+ return sal_False;
-+
-+ if ( xOut.is() )
-+ copyData( xIn, xOut );
-+
-+ if ( xDataSink.is() )
-+ xDataSink->setInputStream( xIn );
-+
-+ return sal_True;
-+}
-+
-+extern "C" {
-+ static void
-+ vfs_authentication_callback (gconstpointer in_void,
-+ gsize in_size,
-+ gpointer out_void,
-+ gsize out_size,
-+ gpointer callback_data)
-+ {
-+ task::XInteractionHandler *xIH;
-+
-+#ifdef DEBUG
-+ g_warning ("Authentication callback (%p)...", callback_data);
-+#endif
-+
-+ if( !( xIH = (task::XInteractionHandler *) callback_data ) )
-+ return;
-+
-+ const GnomeVFSModuleCallbackAuthenticationIn *in =
-+ (const GnomeVFSModuleCallbackAuthenticationIn *) in_void;
-+ GnomeVFSModuleCallbackAuthenticationOut *out =
-+ (GnomeVFSModuleCallbackAuthenticationOut *) out_void;
-+
-+ g_return_if_fail (in != NULL && out != NULL);
-+ g_return_if_fail (sizeof (GnomeVFSModuleCallbackAuthenticationIn) == in_size &&
-+ sizeof (GnomeVFSModuleCallbackAuthenticationOut) == out_size);
-+
-+
-+ ::rtl::OUString inHostName, inRealm;
-+ ::rtl::OUString aUserName, aPassword;
-+
-+ if( in->uri ) {
-+ GnomeVFSURI *uri = gnome_vfs_uri_new( in->uri );
-+ if( gnome_vfs_uri_get_host_name( uri ) )
-+ inHostName = rtl::OUString::createFromAscii
-+ ( gnome_vfs_uri_get_host_name( uri ) );
-+ if( gnome_vfs_uri_get_user_name( uri ) )
-+ aUserName = rtl::OUString::createFromAscii
-+ ( gnome_vfs_uri_get_user_name( uri ) );
-+ if( gnome_vfs_uri_get_password( uri ) )
-+ aPassword = rtl::OUString::createFromAscii
-+ ( gnome_vfs_uri_get_password( uri ) );
-+ gnome_vfs_uri_unref (uri);
-+ }
-+ if( in->realm )
-+ inRealm = rtl::OUString::createFromAscii( in->realm );
-+
-+ rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest
-+ = new ucbhelper::SimpleAuthenticationRequest
-+ ( inHostName, inRealm, rtl::OUString(), rtl::OUString() );
-+
-+ xIH->handle( xRequest.get() );
-+
-+ rtl::Reference< ucbhelper::InteractionContinuation > xSelection
-+ = xRequest->getSelection();
-+
-+ if ( xSelection.is() ) {
-+ // Handler handled the request.
-+ uno::Reference< task::XInteractionAbort > xAbort(xSelection.get(), uno::UNO_QUERY );
-+ if ( !xAbort.is() ) {
-+ const rtl::Reference<
-+ ucbhelper::InteractionSupplyAuthentication > & xSupp
-+ = xRequest->getAuthenticationSupplier();
-+
-+ aUserName = xSupp->getUserName();
-+ aPassword = xSupp->getPassword();
-+
-+ out->username = OUStringToGnome( aUserName );
-+ out->password = OUStringToGnome( aPassword );
-+#ifdef DEBUG
-+ g_warning ("Got valid user/password '%s' '%s'",
-+ out->username, out->password);
-+#endif
-+ }
-+ }
-+ }
-+
-+ static void
-+ auth_destroy (gpointer data)
-+ {
-+ task::XInteractionHandler *xIH;
-+ if( ( xIH = ( task::XInteractionHandler * )data ) )
-+ xIH->release();
-+ }
-+
-+ // This sucks, but gnome-vfs doesn't much like
-+ // repeated set / unsets - so we have to compensate.
-+ GPrivate *auth_queue = NULL;
-+
-+ void auth_queue_destroy( gpointer data )
-+ {
-+ GList *l;
-+ GQueue *vq = (GQueue *) data;
-+
-+ for (l = vq->head; l; l = l->next)
-+ auth_destroy (l->data);
-+ g_queue_free (vq);
-+ }
-+};
-+
-+static void
-+refresh_auth( GQueue *vq )
-+{
-+ GList *l;
-+
-+ gnome_vfs_module_callback_pop( GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION );
-+
-+ for (l = vq->head; l; l = l->next) {
-+ if (l->data) {
-+ gnome_vfs_module_callback_push
-+ ( GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION,
-+ vfs_authentication_callback, l->data, NULL );
-+ break;
-+ }
-+ }
-+}
-+
-+gvfs::Authentication::Authentication(const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment > & xEnv )
-+{
-+ GQueue *vq;
-+ uno::Reference< task::XInteractionHandler > xIH;
-+
-+ if ( xEnv.is() )
-+ xIH = xEnv->getInteractionHandler();
-+
-+ if ( xIH.is() )
-+ xIH->acquire();
-+
-+ if( !(vq = (GQueue *)g_private_get( auth_queue ) ) ) {
-+ vq = g_queue_new();
-+ g_private_set( auth_queue, vq );
-+ }
-+
-+ g_queue_push_head( vq, (gpointer) xIH.get() );
-+ refresh_auth( vq );
-+}
-+
-+gvfs::Authentication::~Authentication()
-+{
-+ GQueue *vq;
-+ gpointer data;
-+
-+ vq = (GQueue *)g_private_get( auth_queue );
-+
-+ data = g_queue_pop_head( vq );
-+ auth_destroy (data);
-+
-+ refresh_auth( vq );
-+}
+++ /dev/null
---- ucb/source/ucp/gvfs/directory.hxx 2003-04-24 16:24:35.000000000 +0100
-+++ ucb/source/ucp/gvfs/directory.hxx 2003-04-24 16:24:35.000000000 +0100
-@@ -0,0 +1,78 @@
-+#ifndef _GVFS_UCP_RESULTSET_HXX
-+#define _GVFS_UCP_RESULTSET_HXX
-+
-+#ifndef _RTL_REF_HXX_
-+#include <rtl/ref.hxx>
-+#endif
-+#ifndef _UCBHELPER_RESULTSET_HXX
-+#include <ucbhelper/resultset.hxx>
-+#endif
-+#ifndef _UCBHELPER_RESULTSETHELPER_HXX
-+#include <ucbhelper/resultsethelper.hxx>
-+#endif
-+
-+#ifndef _GVFS_UCP_CONTENT_HXX
-+#include "content.hxx"
-+#endif
-+
-+namespace gvfs {
-+
-+class DynamicResultSet : public ::ucb::ResultSetImplHelper
-+{
-+ rtl::Reference< Content > m_xContent;
-+ com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment > m_xEnv;
-+
-+private:
-+ virtual void initStatic();
-+ virtual void initDynamic();
-+
-+public:
-+ DynamicResultSet( const com::sun::star::uno::Reference<
-+ com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-+ const rtl::Reference< Content >& rxContent,
-+ const com::sun::star::ucb::OpenCommandArgument2& rCommand,
-+ const com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XCommandEnvironment >& rxEnv );
-+};
-+
-+
-+struct gvfs::DataSupplier_Impl;
-+class DataSupplier : public ucb::ResultSetDataSupplier
-+{
-+private:
-+ gvfs::DataSupplier_Impl *m_pImpl;
-+ sal_Bool DataSupplier::getData();
-+
-+public:
-+ DataSupplier( const com::sun::star::uno::Reference<
-+ com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-+ const rtl::Reference< Content >& rContent,
-+ sal_Int32 nOpenMode);
-+
-+ virtual ~DataSupplier();
-+
-+ virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex );
-+ virtual com::sun::star::uno::Reference<
-+ com::sun::star::ucb::XContentIdentifier >
-+ queryContentIdentifier( sal_uInt32 nIndex );
-+ virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
-+ queryContent( sal_uInt32 nIndex );
-+
-+ virtual sal_Bool getResult( sal_uInt32 nIndex );
-+
-+ virtual sal_uInt32 totalCount();
-+ virtual sal_uInt32 currentCount();
-+ virtual sal_Bool isCountFinal();
-+
-+ virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
-+ queryPropertyValues( sal_uInt32 nIndex );
-+ virtual void releasePropertyValues( sal_uInt32 nIndex );
-+ virtual void close();
-+ virtual void validate()
-+ throw( com::sun::star::ucb::ResultSetException );
-+};
-+
-+}
-+
-+#endif
---- ucb/source/ucp/gvfs/directory.cxx 2003-04-24 17:03:31.000000000 +0100
-+++ ucb/source/ucp/gvfs/directory.cxx 2003-04-24 17:03:31.000000000 +0100
-@@ -0,0 +1,399 @@
-+/*
-+ * This file pinched from webdavdatasupplier (etc.)
-+ * cut & paste + new getData impl. & collate ResultSet code.
-+ */
-+#include <vector>
-+#ifndef _OSL_DIAGNOSE_H_
-+#include <osl/diagnose.h>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_OPENMODE_HPP_
-+#include <com/sun/star/ucb/OpenMode.hpp>
-+#endif
-+#ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
-+#include <ucbhelper/contentidentifier.hxx>
-+#endif
-+#ifndef _UCBHELPER_PROVIDERHELPER_HXX
-+#include <ucbhelper/providerhelper.hxx>
-+#endif
-+
-+#include "directory.hxx"
-+
-+#include <libgnomevfs/gnome-vfs-utils.h>
-+#include <libgnomevfs/gnome-vfs-directory.h>
-+
-+using namespace com::sun::star;
-+using namespace gvfs;
-+
-+// DynamicResultSet Implementation.
-+
-+DynamicResultSet::DynamicResultSet(
-+ const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
-+ const rtl::Reference< Content >& rxContent,
-+ const com::sun::star::ucb::OpenCommandArgument2& rCommand,
-+ const uno::Reference<com::sun::star::ucb::XCommandEnvironment >& rxEnv )
-+ : ResultSetImplHelper( rxSMgr, rCommand ),
-+ m_xContent( rxContent ),
-+ m_xEnv( rxEnv )
-+{
-+}
-+void DynamicResultSet::initStatic()
-+{
-+ m_xResultSet1
-+ = new ::ucb::ResultSet( m_xSMgr,
-+ m_aCommand.Properties,
-+ new DataSupplier( m_xSMgr,
-+ m_xContent,
-+ m_aCommand.Mode ),
-+ m_xEnv );
-+}
-+void DynamicResultSet::initDynamic()
-+{
-+ initStatic();
-+ m_xResultSet2 = m_xResultSet1;
-+}
-+
-+//=========================================================================
-+
-+
-+// DataSupplier Implementation.
-+
-+
-+
-+struct ResultListEntry
-+{
-+ rtl::OUString aId;
-+ uno::Reference< com::sun::star::ucb::XContentIdentifier > xId;
-+ uno::Reference< com::sun::star::ucb::XContent > xContent;
-+ uno::Reference< sdbc::XRow > xRow;
-+ GnomeVFSFileInfo aInfo;
-+
-+ ResultListEntry( const GnomeVFSFileInfo *fileInfo)
-+ {
-+ gnome_vfs_file_info_copy (&aInfo, fileInfo);
-+ }
-+
-+ ~ResultListEntry()
-+ {
-+ gnome_vfs_file_info_clear (&aInfo);
-+ }
-+};
-+
-+//=========================================================================
-+//
-+// ResultList.
-+//
-+//=========================================================================
-+
-+typedef std::vector< ResultListEntry* > ResultList;
-+
-+//=========================================================================
-+//
-+// struct DataSupplier_Impl.
-+//
-+//=========================================================================
-+
-+struct gvfs::DataSupplier_Impl
-+{
-+ osl::Mutex m_aMutex;
-+ ResultList m_aResults;
-+ rtl::Reference< Content > m_xContent;
-+ uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
-+ sal_Int32 m_nOpenMode;
-+ sal_Bool m_bCountFinal;
-+
-+ DataSupplier_Impl(
-+ const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
-+ const rtl::Reference< Content >& rContent,
-+ sal_Int32 nOpenMode )
-+ : m_xContent( rContent ), m_xSMgr( rxSMgr ),
-+ m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {}
-+ ~DataSupplier_Impl()
-+ {
-+ ResultList::const_iterator it = m_aResults.begin();
-+ ResultList::const_iterator end = m_aResults.end();
-+
-+ while ( it != end )
-+ {
-+ delete (*it);
-+ it++;
-+ }
-+ }
-+};
-+
-+DataSupplier::DataSupplier(
-+ const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
-+ const rtl::Reference< Content >& rContent,
-+ sal_Int32 nOpenMode )
-+: m_pImpl( new DataSupplier_Impl( rxSMgr, rContent, nOpenMode ) )
-+{
-+}
-+
-+//=========================================================================
-+// virtual
-+DataSupplier::~DataSupplier()
-+{
-+ delete m_pImpl;
-+}
-+
-+// virtual
-+rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( nIndex < m_pImpl->m_aResults.size() ) {
-+ rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId;
-+ if ( aId.getLength() ) // cached
-+ return aId;
-+ }
-+
-+ if ( getResult( nIndex ) ) {
-+ rtl::OUString aId = m_pImpl->m_xContent->getOUURI();
-+
-+ char *escaped_name;
-+ escaped_name = gnome_vfs_escape_string( m_pImpl->m_aResults[ nIndex ]->aInfo.name );
-+
-+ if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
-+ aId += rtl::OUString::createFromAscii( "/" );
-+
-+ aId += rtl::OUString::createFromAscii( escaped_name );
-+
-+ g_free( escaped_name );
-+
-+ m_pImpl->m_aResults[ nIndex ]->aId = aId;
-+ return aId;
-+ }
-+
-+ return rtl::OUString();
-+}
-+
-+// virtual
-+uno::Reference< com::sun::star::ucb::XContentIdentifier >
-+DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( nIndex < m_pImpl->m_aResults.size() ) {
-+ uno::Reference< com::sun::star::ucb::XContentIdentifier > xId
-+ = m_pImpl->m_aResults[ nIndex ]->xId;
-+ if ( xId.is() ) // Already cached.
-+ return xId;
-+ }
-+
-+ rtl::OUString aId = queryContentIdentifierString( nIndex );
-+ if ( aId.getLength() ) {
-+ uno::Reference< com::sun::star::ucb::XContentIdentifier > xId
-+ = new ::ucb::ContentIdentifier( aId );
-+ m_pImpl->m_aResults[ nIndex ]->xId = xId;
-+ return xId;
-+ }
-+
-+ return uno::Reference< com::sun::star::ucb::XContentIdentifier >();
-+}
-+
-+// virtual
-+uno::Reference< com::sun::star::ucb::XContent >
-+DataSupplier::queryContent( sal_uInt32 nIndex )
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( nIndex < m_pImpl->m_aResults.size() ) {
-+ uno::Reference< com::sun::star::ucb::XContent > xContent
-+ = m_pImpl->m_aResults[ nIndex ]->xContent;
-+ if ( xContent.is() ) // Already cached.
-+ return xContent;
-+ }
-+
-+ uno::Reference< com::sun::star::ucb::XContentIdentifier > xId
-+ = queryContentIdentifier( nIndex );
-+ if ( xId.is() ) {
-+ try
-+ {
-+ // FIXME:
-+ // It would be really nice to propagate this information
-+ // to the Content, but we can't then register it with the
-+ // ContentProvider, and the ucbhelper hinders here.
-+ uno::Reference< com::sun::star::ucb::XContent > xContent
-+ = m_pImpl->m_xContent->getProvider()->queryContent( xId );
-+ m_pImpl->m_aResults[ nIndex ]->xContent = xContent;
-+ return xContent;
-+
-+ }
-+ catch ( com::sun::star::ucb::IllegalIdentifierException& ) {
-+ }
-+ }
-+ return uno::Reference< com::sun::star::ucb::XContent >();
-+}
-+
-+// virtual
-+sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
-+{
-+ osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( m_pImpl->m_aResults.size() > nIndex ) // Result already present.
-+ return sal_True;
-+
-+ if ( getData() && m_pImpl->m_aResults.size() > nIndex )
-+ return sal_True;
-+
-+ return sal_False;
-+}
-+
-+// virtual
-+sal_uInt32 DataSupplier::totalCount()
-+{
-+ getData();
-+
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ return m_pImpl->m_aResults.size();
-+}
-+
-+// virtual
-+sal_uInt32 DataSupplier::currentCount()
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+ return m_pImpl->m_aResults.size();
-+}
-+
-+// virtual
-+sal_Bool DataSupplier::isCountFinal()
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+ return m_pImpl->m_bCountFinal;
-+}
-+
-+// virtual
-+uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nIndex )
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( nIndex < m_pImpl->m_aResults.size() ) {
-+ uno::Reference< sdbc::XRow > xRow = m_pImpl->m_aResults[ nIndex ]->xRow;
-+ if ( xRow.is() ) // Already cached.
-+ return xRow;
-+ }
-+
-+ if ( getResult( nIndex ) ) {
-+ // Inefficient - but we can't create xContent's sensibly
-+ // nor can we do the property code sensibly cleanly staticaly.
-+ Content *pContent = static_cast< ::gvfs::Content * >(queryContent( nIndex ).get());
-+
-+ uno::Reference< sdbc::XRow > xRow =
-+ pContent->getPropertyValues( getResultSet()->getProperties(),
-+ getResultSet()->getEnvironment() );
-+
-+ m_pImpl->m_aResults[ nIndex ]->xRow = xRow;
-+
-+ return xRow;
-+ }
-+
-+ return uno::Reference< sdbc::XRow >();
-+}
-+
-+// virtual
-+void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
-+{
-+ osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( nIndex < m_pImpl->m_aResults.size() )
-+ m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
-+}
-+
-+// virtual
-+void DataSupplier::close()
-+{
-+}
-+
-+// virtual
-+void DataSupplier::validate()
-+ throw( com::sun::star::ucb::ResultSetException )
-+{
-+}
-+
-+sal_Bool DataSupplier::getData()
-+{
-+ osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-+
-+ if ( !m_pImpl->m_bCountFinal ) {
-+ GnomeVFSResult result;
-+ GnomeVFSDirectoryHandle *dirHandle = NULL;
-+
-+ {
-+ Authentication aAuth( getResultSet()->getEnvironment() );
-+ char *uri = m_pImpl->m_xContent->getURI();
-+ result = gnome_vfs_directory_open
-+ ( &dirHandle, uri, GNOME_VFS_FILE_INFO_DEFAULT );
-+
-+ if (result != GNOME_VFS_OK) {
-+#ifdef DEBUG
-+ g_warning ("Failed open of '%s' with '%s'",
-+ uri, gnome_vfs_result_to_string( result ));
-+#endif
-+ g_free( uri );
-+ return sal_False;
-+ }
-+
-+ g_free( uri );
-+ }
-+
-+
-+ GnomeVFSFileInfo fileInfo = { 0 };
-+ while ((result = gnome_vfs_directory_read_next (dirHandle, &fileInfo)) == GNOME_VFS_OK) {
-+ if( fileInfo.name && fileInfo.name[0] == '.' &&
-+ ( fileInfo.name[1] == '\0' ||
-+ ( fileInfo.name[1] == '.' && fileInfo.name[2] == '\0' ) ) )
-+ continue;
-+
-+ switch ( m_pImpl->m_nOpenMode ) {
-+ case com::sun::star::ucb::OpenMode::FOLDERS:
-+ if ( !(fileInfo.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
-+ fileInfo.type != GNOME_VFS_FILE_TYPE_DIRECTORY )
-+ continue;
-+ break;
-+
-+ case com::sun::star::ucb::OpenMode::DOCUMENTS:
-+ if ( !(fileInfo.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
-+ fileInfo.type != GNOME_VFS_FILE_TYPE_REGULAR )
-+ continue;
-+ break;
-+
-+ case com::sun::star::ucb::OpenMode::ALL:
-+ default:
-+ break;
-+ }
-+
-+ m_pImpl->m_aResults.push_back( new ResultListEntry( &fileInfo ) );
-+ }
-+#ifdef DEBUG
-+ g_warning ("Got %d directory entries", result);
-+#endif
-+
-+ m_pImpl->m_bCountFinal = sal_True;
-+
-+ // Callback possible, because listeners may be informed!
-+ aGuard.clear();
-+ getResultSet()->rowCountFinal();
-+
-+ if (result != GNOME_VFS_ERROR_EOF) {
-+#ifdef DEBUG
-+ g_warning( "Failed read_next '%s'",
-+ gnome_vfs_result_to_string( result ) );
-+#endif
-+ return sal_False;
-+ }
-+
-+ result = gnome_vfs_directory_close (dirHandle);
-+ if (result != GNOME_VFS_OK) {
-+#ifdef DEBUG
-+ g_warning( "Failed close '%s'",
-+ gnome_vfs_result_to_string( result ) );
-+#endif
-+ return sal_False;
-+ }
-+ }
-+
-+ return sal_True;
-+}
-+
-+
-+
+++ /dev/null
---- offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
-+++ offapi/com/sun/star/ucb/GnomeVFSContentProvider.idl
-@@ -0,0 +1,21 @@
-+#ifndef __com_sun_star_ucb_GnomeVFSContentProvider_idl__
-+#define __com_sun_star_ucb_GnomeVFSContentProvider_idl__
-+
-+#ifndef __com_sun_star_ucb_XContentProvider_idl__
-+#include <com/sun/star/ucb/XContentProvider.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module ucb {
-+
-+service GnomeVFSContentProvider
-+{
-+ interface com::sun::star::ucb::XContentProvider;
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
-+++ offapi/com/sun/star/ucb/GnomeVFSDocumentContent.idl
-@@ -0,0 +1,97 @@
-+#ifndef __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
-+#define __com_sun_star_ucb_GnomeVFSDocumentContent_idl__
-+
-+#ifndef __com_sun_star_lang_XComponent_idl__
-+#include <com/sun/star/lang/XComponent.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XContent_idl__
-+#include <com/sun/star/ucb/XContent.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
-+#include <com/sun/star/ucb/XCommandProcessor.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
-+#include <com/sun/star/ucb/XCommandProcessor2.idl>
-+#endif
-+
-+#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-+#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-+#endif
-+
-+#ifndef __com_sun_star_beans_XPropertyContainer_idl__
-+#include <com/sun/star/beans/XPropertyContainer.idl>
-+#endif
-+
-+#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-+#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
-+#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-+#endif
-+
-+#ifndef __com_sun_star_container_XChild_idl__
-+#include <com/sun/star/container/XChild.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module ucb {
-+
-+service GnomeVFSDocumentContent
-+{
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::lang::XComponent;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::ucb::XContent;
-+
-+ interface com::sun::star::ucb::XCommandProcessor;
-+
-+ [optional] interface com::sun::star::ucb::XCommandProcessor2;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::beans::XPropertiesChangeNotifier;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::beans::XPropertyContainer;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::beans::XPropertySetInfoChangeNotifier;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::ucb::XCommandInfoChangeNotifier;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::container::XChild;
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
---- offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
-+++ offapi/com/sun/star/ucb/GnomeVFSFolderContent.idl
-@@ -0,0 +1,109 @@
-+#ifndef __com_sun_star_ucb_GnomeVFSFolderContent_idl__
-+#define __com_sun_star_ucb_GnomeVFSFolderContent_idl__
-+
-+#ifndef __com_sun_star_lang_XComponent_idl__
-+#include <com/sun/star/lang/XComponent.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XContent_idl__
-+#include <com/sun/star/ucb/XContent.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XCommandProcessor_idl__
-+#include <com/sun/star/ucb/XCommandProcessor.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XCommandProcessor2_idl__
-+#include <com/sun/star/ucb/XCommandProcessor2.idl>
-+#endif
-+
-+#ifndef __com_sun_star_beans_XPropertiesChangeNotifier_idl__
-+#include <com/sun/star/beans/XPropertiesChangeNotifier.idl>
-+#endif
-+
-+#ifndef __com_sun_star_beans_XPropertyContainer_idl__
-+#include <com/sun/star/beans/XPropertyContainer.idl>
-+#endif
-+
-+#ifndef __com_sun_star_beans_XPropertySetInfoChangeNotifier_idl__
-+#include <com/sun/star/beans/XPropertySetInfoChangeNotifier.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XCommandInfoChangeNotifier_idl__
-+#include <com/sun/star/ucb/XCommandInfoChangeNotifier.idl>
-+#endif
-+
-+#ifndef __com_sun_star_container_XChild_idl__
-+#include <com/sun/star/container/XChild.idl>
-+#endif
-+
-+#ifndef __com_sun_star_ucb_XContentCreator_idl__
-+#include <com/sun/star/ucb/XContentCreator.idl>
-+#endif
-+
-+//=============================================================================
-+
-+module com { module sun { module star { module ucb {
-+
-+//=============================================================================
-+/** A DCP Folder is a container for other DCP Folders or Documents.
-+
-+ @see com::sun::star::ucb::GnomeVFSContentProvider
-+ @see com::sun::star::ucb::GnomeVFSDocumentContent
-+*/
-+service GnomeVFSFolderContent
-+{
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::lang::XComponent;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::ucb::XContent;
-+
-+ interface com::sun::star::ucb::XCommandProcessor;
-+
-+ [optional] interface com::sun::star::ucb::XCommandProcessor2;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::beans::XPropertiesChangeNotifier;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::beans::XPropertyContainer;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::beans::XPropertySetInfoChangeNotifier;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::ucb::XCommandInfoChangeNotifier;
-+
-+ //-------------------------------------------------------------------------
-+ /** This interface is implemented according to the specification of
-+ service <type>Content</type>.
-+ */
-+ interface com::sun::star::container::XChild;
-+
-+ interface com::sun::star::ucb::XContentCreator;
-+};
-+
-+//=============================================================================
-+
-+}; }; }; };
-+
-+#endif
-Index: offapi/com/sun/star/ucb/makefile.mk
-===================================================================
-RCS file: /cvs/api/offapi/com/sun/star/ucb/makefile.mk,v
-retrieving revision 1.41
-diff -u -p -u -r1.41 makefile.mk
---- offapi/com/sun/star/ucb/makefile.mk 27 May 2003 10:29:04 -0000 1.41
-+++ offapi/com/sun/star/ucb/makefile.mk 29 Aug 2003 14:29:02 -0000
-@@ -129,6 +129,9 @@ IDLFILES=\
- FTPContent.idl\
- FTPContentProvider.idl\
- GlobalTransferCommandArgument.idl\
-+ GnomeVFSContentProvider.idl\
-+ GnomeVFSDocumentContent.idl\
-+ GnomeVFSFolderContent.idl\
- HandleCookiesRequest.idl\
- HelpContent.idl\
- HelpContentProvider.idl\
+++ /dev/null
---- ucb/source/ucp/gvfs/provider.hxx 2003-04-24 16:24:35.000000000 +0100
-+++ ucb/source/ucp/gvfs/provider.hxx 2003-04-24 16:24:35.000000000 +0100
-@@ -0,0 +1,49 @@
-+#ifndef _PROVIDER_HXX_
-+#define _PROVIDER_HXX_
-+
-+#include <hash_set>
-+
-+#ifndef _RTL_REF_HXX_
-+#include <rtl/ref.hxx>
-+#endif
-+
-+#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_
-+#include <com/sun/star/beans/Property.hpp>
-+#endif
-+
-+#ifndef _UCBHELPER_PROVIDERHELPER_HXX
-+#include <ucbhelper/providerhelper.hxx>
-+#endif
-+
-+namespace gvfs {
-+
-+class ContentProvider : public ::ucb::ContentProviderImplHelper
-+{
-+public:
-+ ContentProvider( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
-+ virtual ~ContentProvider();
-+
-+ // XInterface
-+ XINTERFACE_DECL()
-+
-+ // XTypeProvider
-+ XTYPEPROVIDER_DECL()
-+
-+ // XServiceInfo
-+ XSERVICEINFO_DECL()
-+
-+ // XContentProvider
-+ virtual ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XContent > SAL_CALL
-+ queryContent( const ::com::sun::star::uno::Reference<
-+ ::com::sun::star::ucb::XContentIdentifier >& Identifier )
-+ throw( ::com::sun::star::ucb::IllegalIdentifierException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+};
-+
-+}; /* namespace gvfs */
-+
-+#endif /* _PROVIDER_HXX_ */
-+
---- ucb/source/ucp/gvfs/provider.cxx 2003-04-28 14:13:04.000000000 +0100
-+++ ucb/source/ucp/gvfs/provider.cxx 2003-04-28 14:13:04.000000000 +0100
-@@ -0,0 +1,208 @@
-+#include <tools/urlobj.hxx>
-+#include <ucbhelper/contentidentifier.hxx>
-+#include <libgnomevfs/gnome-vfs-init.h>
-+#include "provider.hxx"
-+#include "content.hxx"
-+
-+using namespace com::sun::star;
-+using namespace gvfs;
-+
-+//=========================================================================
-+//=========================================================================
-+//
-+// ContentProvider Implementation.
-+//
-+//=========================================================================
-+//=========================================================================
-+
-+ContentProvider::ContentProvider(const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
-+ : ::ucb::ContentProviderImplHelper( rSMgr )
-+{
-+}
-+
-+//=========================================================================
-+// virtual
-+ContentProvider::~ContentProvider()
-+{
-+}
-+
-+//=========================================================================
-+//
-+// XInterface methods.
-+//
-+//=========================================================================
-+
-+XINTERFACE_IMPL_3( ContentProvider,
-+ lang::XTypeProvider,
-+ lang::XServiceInfo,
-+ com::sun::star::ucb::XContentProvider );
-+
-+//=========================================================================
-+//
-+// XTypeProvider methods.
-+//
-+//=========================================================================
-+
-+XTYPEPROVIDER_IMPL_3( ContentProvider,
-+ lang::XTypeProvider,
-+ lang::XServiceInfo,
-+ com::sun::star::ucb::XContentProvider );
-+
-+//=========================================================================
-+//
-+// XServiceInfo methods.
-+//
-+//=========================================================================
-+
-+XSERVICEINFO_IMPL_1( ContentProvider,
-+ rtl::OUString::createFromAscii(
-+ "com.sun.star.comp.GnomeVFSContentProvider" ),
-+ rtl::OUString::createFromAscii(
-+ "com.sun.star.ucb.GnomeVFSContentProvider" ) );
-+//=========================================================================
-+//
-+// Service factory implementation.
-+//
-+//=========================================================================
-+
-+ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
-+
-+//=========================================================================
-+//
-+// XContentProvider methods.
-+//
-+//=========================================================================
-+
-+uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
-+ContentProvider::queryContent(
-+ const uno::Reference<
-+ com::sun::star::ucb::XContentIdentifier >& Identifier )
-+ throw( com::sun::star::ucb::IllegalIdentifierException,
-+ uno::RuntimeException )
-+{
-+#ifdef DEBUG
-+ g_warning ("QueryContent: '%s'",
-+ (const sal_Char *)rtl::OUStringToOString
-+ (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
-+#endif
-+
-+ // It sucks to depend on 'tools' but ...
-+ INetURLObject url( Identifier->getContentIdentifier() );
-+ if ( url.GetProtocol() < INET_PROT_END ) {
-+#ifdef DEBUG
-+ g_warning ("Not one of ours ... '%s'",
-+ (const sal_Char *)rtl::OUStringToOString
-+ (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
-+#endif
-+ throw com::sun::star::ucb::IllegalIdentifierException();
-+ }
-+
-+ vos::OGuard aGuard( m_aMutex );
-+
-+ // Check, if a content with given id already exists...
-+ uno::Reference< com::sun::star::ucb::XContent > xContent
-+ = queryExistingContent( Identifier ).getBodyPtr();
-+ if ( xContent.is() )
-+ return xContent;
-+
-+ try
-+ {
-+ xContent = new ::gvfs::Content(m_xSMgr, this, Identifier );
-+ }
-+ catch ( com::sun::star::ucb::ContentCreationException const & )
-+ {
-+ throw com::sun::star::ucb::IllegalIdentifierException();
-+ }
-+
-+ if ( !xContent->getIdentifier().is() )
-+ throw com::sun::star::ucb::IllegalIdentifierException();
-+
-+ return xContent;
-+}
-+
-+
-+//============================ shlib entry points =============================================
-+
-+
-+// cut and paste verbatim from webdav (that sucks).
-+static sal_Bool
-+writeInfo( void *pRegistryKey,
-+ const rtl::OUString &rImplementationName,
-+ uno::Sequence< rtl::OUString > const &rServiceNames )
-+{
-+ rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
-+ aKeyName += rImplementationName;
-+ aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
-+
-+ uno::Reference< registry::XRegistryKey > xKey;
-+ try {
-+ xKey = static_cast< registry::XRegistryKey * >
-+ (pRegistryKey )->createKey( aKeyName );
-+ }
-+ catch ( registry::InvalidRegistryException const & ) {
-+ }
-+
-+ if ( !xKey.is() )
-+ return sal_False;
-+
-+ sal_Bool bSuccess = sal_True;
-+
-+ for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n ) {
-+ try {
-+ xKey->createKey( rServiceNames[ n ] );
-+
-+ } catch ( registry::InvalidRegistryException const & ) {
-+ bSuccess = sal_False;
-+ break;
-+ }
-+ }
-+ return bSuccess;
-+}
-+
-+extern "C" void SAL_CALL
-+component_getImplementationEnvironment( const sal_Char **ppEnvTypeName,
-+ uno_Environment **ppEnv )
-+{
-+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-+}
-+
-+extern "C" sal_Bool SAL_CALL
-+component_writeInfo( void *pServiceManager,
-+ void *pRegistryKey )
-+{
-+ return pRegistryKey &&
-+ writeInfo( pRegistryKey,
-+ ::gvfs::ContentProvider::getImplementationName_Static(),
-+ ::gvfs::ContentProvider::getSupportedServiceNames_Static() );
-+}
-+extern "C" void * SAL_CALL
-+component_getFactory( const sal_Char *pImplName,
-+ void *pServiceManager,
-+ void *pRegistryKey )
-+{
-+ void * pRet = 0;
-+
-+ {
-+ osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-+ if (!gnome_vfs_initialized ())
-+ gnome_vfs_init ();
-+ if (!auth_queue)
-+ auth_queue = g_private_new( auth_queue_destroy );
-+ }
-+
-+ uno::Reference< lang::XMultiServiceFactory > xSMgr
-+ (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
-+ uno::Reference< lang::XSingleServiceFactory > xFactory;
-+
-+ if ( !::gvfs::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
-+ xFactory = ::gvfs::ContentProvider::createServiceFactory( xSMgr );
-+
-+ if ( xFactory.is() ) {
-+ xFactory->acquire();
-+ pRet = xFactory.get();
-+ }
-+
-+ return pRet;
-+}
-+
-+
+++ /dev/null
---- ucb/source/ucp/gvfs/stream.hxx 2003-04-24 16:24:35.000000000 +0100
-+++ ucb/source/ucp/gvfs/stream.hxx 2003-04-24 16:24:35.000000000 +0100
-@@ -0,0 +1,156 @@
-+#ifndef _GVFSSTREAM_HXX_
-+#define _GVFSSTREAM_HXX_
-+
-+#ifndef _SAL_TYPES_H_
-+#include <sal/types.h>
-+#endif
-+#ifndef _RTL_USTRING_HXX_
-+#include <rtl/ustring.hxx>
-+#endif
-+#ifndef _CPPUHELPER_WEAK_HXX_
-+#include <cppuhelper/weak.hxx>
-+#endif
-+
-+#ifndef _COM_SUN_STAR_IO_XSTREAM_HPP_
-+#include <com/sun/star/io/XStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
-+#include <com/sun/star/io/XInputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
-+#include <com/sun/star/io/XOutputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XTRUNCATE_HPP_
-+#include <com/sun/star/io/XTruncate.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
-+#include <com/sun/star/io/XSeekable.hpp>
-+#endif
-+
-+#include <libgnomevfs/gnome-vfs-handle.h>
-+
-+namespace gvfs
-+{
-+
-+class Stream : public ::com::sun::star::io::XStream,
-+ public ::com::sun::star::io::XInputStream,
-+ public ::com::sun::star::io::XOutputStream,
-+ public ::com::sun::star::io::XTruncate,
-+ public ::com::sun::star::io::XSeekable,
-+ public ::cppu::OWeakObject
-+{
-+private:
-+ GnomeVFSHandle *m_handle;
-+ GnomeVFSFileInfo m_info;
-+ osl::Mutex m_aMutex;
-+ sal_Bool m_eof;
-+ sal_Bool m_bInputStreamCalled;
-+ sal_Bool m_bOutputStreamCalled;
-+
-+ void throwOnError( GnomeVFSResult result )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::BufferSizeExceededException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ void closeStream( void )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+public:
-+ Stream ( GnomeVFSHandle *handle,
-+ const GnomeVFSFileInfo *aInfo );
-+ virtual ~Stream();
-+
-+ // XInterface
-+ virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
-+ throw( ::com::sun::star::uno::RuntimeException );
-+ virtual void SAL_CALL acquire( void )
-+ throw ()
-+ { OWeakObject::acquire(); }
-+ virtual void SAL_CALL release( void )
-+ throw()
-+ { OWeakObject::release(); }
-+
-+ // XStream
-+ virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream( )
-+ throw( com::sun::star::uno::RuntimeException );
-+
-+ virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( )
-+ throw( com::sun::star::uno::RuntimeException );
-+
-+ // XInputStream
-+ virtual sal_Int32 SAL_CALL readBytes(
-+ ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
-+ sal_Int32 nBytesToRead )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::BufferSizeExceededException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ virtual sal_Int32 SAL_CALL readSomeBytes(
-+ ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
-+ sal_Int32 nMaxBytesToRead )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::BufferSizeExceededException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::BufferSizeExceededException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ virtual sal_Int32 SAL_CALL available( void )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ virtual void SAL_CALL closeInput( void )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ // XSeekable
-+ virtual void SAL_CALL seek( sal_Int64 location )
-+ throw( ::com::sun::star::lang::IllegalArgumentException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ virtual sal_Int64 SAL_CALL getPosition()
-+ throw( ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ virtual sal_Int64 SAL_CALL getLength()
-+ throw( ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException );
-+
-+ // XOutputStream
-+ virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData )
-+ throw( com::sun::star::io::NotConnectedException,
-+ com::sun::star::io::BufferSizeExceededException,
-+ com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException);
-+
-+ virtual void SAL_CALL flush( void )
-+ throw( com::sun::star::io::NotConnectedException,
-+ com::sun::star::io::BufferSizeExceededException,
-+ com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException);
-+
-+
-+ virtual void SAL_CALL closeOutput( void )
-+ throw( com::sun::star::io::NotConnectedException,
-+ com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException );
-+
-+ // XTruncate
-+ virtual void SAL_CALL truncate( void )
-+ throw( com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException );
-+};
-+
-+}; // namespace gvfs
-+#endif // _GVFSSTREAM_HXX_
---- ucb/source/ucp/gvfs/stream.cxx 2003-04-24 16:24:35.000000000 +0100
-+++ ucb/source/ucp/gvfs/stream.cxx 2003-04-24 16:24:35.000000000 +0100
-@@ -0,0 +1,319 @@
-+#include "stream.hxx"
-+
-+#ifndef _RTL_MEMORY_H_
-+#include <rtl/memory.h>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_INTERACTIVEAUGMENTEDIOEXCEPTION_HPP_
-+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-+#endif
-+
-+#include <libgnomevfs/gnome-vfs-ops.h>
-+
-+using namespace cppu;
-+using namespace rtl;
-+using namespace com::sun::star::io;
-+using namespace com::sun::star::uno;
-+using namespace com::sun::star::ucb;
-+using namespace gvfs;
-+
-+Stream::Stream( GnomeVFSHandle *handle,
-+ const GnomeVFSFileInfo *aInfo ) :
-+ m_eof (sal_False),
-+ m_bInputStreamCalled( sal_False ),
-+ m_bOutputStreamCalled( sal_False )
-+{
-+ m_handle = handle;
-+ gnome_vfs_file_info_copy (&m_info, aInfo);
-+}
-+
-+Stream::~Stream( void )
-+{
-+ if (m_handle) {
-+ gnome_vfs_close (m_handle);
-+ m_handle = NULL;
-+ }
-+}
-+
-+Any Stream::queryInterface( const Type &type )
-+ throw( RuntimeException )
-+{
-+ Any aRet = ::cppu::queryInterface
-+ ( type,
-+ static_cast< XStream * >( this ),
-+ static_cast< XInputStream * >( this ),
-+ static_cast< XOutputStream * >( this ),
-+ static_cast< XSeekable * >( this ),
-+ static_cast< XTruncate * >( this ) );
-+
-+ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type );
-+}
-+
-+// -------------------------------------------------------------------
-+// XStream
-+// -------------------------------------------------------------------
-+
-+com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
-+Stream::getInputStream( )
-+ throw( com::sun::star::uno::RuntimeException )
-+{
-+ {
-+ osl::MutexGuard aGuard( m_aMutex );
-+ m_bInputStreamCalled = true;
-+ }
-+ return Reference< XInputStream >( this );
-+}
-+
-+com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL
-+Stream::getOutputStream( )
-+ throw( com::sun::star::uno::RuntimeException )
-+{
-+ {
-+ osl::MutexGuard aGuard( m_aMutex );
-+ m_bOutputStreamCalled = true;
-+ }
-+ return Reference< XOutputStream >( this );
-+}
-+
-+// -------------------------------------------------------------------
-+// XInputStream
-+// -------------------------------------------------------------------
-+
-+sal_Int32 SAL_CALL Stream::readBytes(
-+ Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-+ throw( NotConnectedException,
-+ BufferSizeExceededException,
-+ IOException,
-+ RuntimeException )
-+{
-+ GnomeVFSResult result;
-+ GnomeVFSFileSize nBytesRead = 0;
-+
-+ if( ! m_handle )
-+ throw IOException();
-+
-+ if( m_eof ) {
-+ aData.realloc( 0 );
-+ return 0;
-+ }
-+
-+ try {
-+ aData.realloc( nBytesToRead );
-+ } catch ( const Exception &e ) {
-+ throw BufferSizeExceededException();
-+ }
-+
-+ do {
-+ result = gnome_vfs_read( m_handle, aData.getArray(),
-+ nBytesToRead, &nBytesRead );
-+ } while( result == GNOME_VFS_ERROR_INTERRUPTED );
-+
-+ if (result != GNOME_VFS_OK &&
-+ result != GNOME_VFS_ERROR_EOF)
-+ throwOnError( result );
-+
-+ if (result == GNOME_VFS_ERROR_EOF)
-+ m_eof = sal_True;
-+
-+ aData.realloc( nBytesRead );
-+
-+ return nBytesRead;
-+}
-+
-+sal_Int32 SAL_CALL Stream::readSomeBytes(
-+ Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-+ throw( NotConnectedException,
-+ BufferSizeExceededException,
-+ IOException,
-+ RuntimeException )
-+{
-+ // Again - having 2 methods here just sucks; cf. filinpstr.cxx
-+ // This can never be an effective non-blocking API - so why bother ?
-+ return readSomeBytes( aData, nMaxBytesToRead );
-+}
-+
-+void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip )
-+ throw( NotConnectedException,
-+ BufferSizeExceededException,
-+ IOException,
-+ RuntimeException )
-+{
-+ GnomeVFSResult result;
-+
-+ if( ! m_handle )
-+ throw IOException();
-+
-+ result = gnome_vfs_seek( m_handle, GNOME_VFS_SEEK_CURRENT, nBytesToSkip );
-+
-+ if ( result == GNOME_VFS_ERROR_BAD_PARAMETERS ||
-+ result == GNOME_VFS_ERROR_NOT_SUPPORTED )
-+ g_warning ("FIXME: just read them in ...");
-+
-+ throwOnError( result );
-+}
-+
-+sal_Int32 SAL_CALL Stream::available( )
-+ throw( NotConnectedException,
-+ IOException,
-+ RuntimeException )
-+{
-+ return 0; // cf. filinpstr.cxx
-+}
-+
-+void SAL_CALL Stream::closeInput( void )
-+ throw( NotConnectedException,
-+ IOException,
-+ RuntimeException )
-+{
-+ osl::MutexGuard aGuard( m_aMutex );
-+ m_bInputStreamCalled = false;
-+
-+ if( ! m_bOutputStreamCalled )
-+ closeStream();
-+}
-+
-+// -------------------------------------------------------------------
-+// XSeekable
-+// -------------------------------------------------------------------
-+
-+void SAL_CALL Stream::seek( sal_Int64 location )
-+ throw( ::com::sun::star::lang::IllegalArgumentException,
-+ IOException,
-+ RuntimeException )
-+{
-+ GnomeVFSResult result;
-+
-+ if( ! m_handle )
-+ throw IOException();
-+
-+ if ( location < 0 )
-+ throw ::com::sun::star::lang::IllegalArgumentException();
-+
-+ m_eof = sal_False;
-+ result = gnome_vfs_seek( m_handle, GNOME_VFS_SEEK_START, location );
-+
-+ if (result == GNOME_VFS_ERROR_EOF)
-+ throw ::com::sun::star::lang::IllegalArgumentException();
-+
-+ throwOnError( result );
-+}
-+
-+sal_Int64 SAL_CALL Stream::getPosition()
-+ throw( IOException,
-+ RuntimeException )
-+{
-+ GnomeVFSFileSize nBytesIn = 0;
-+
-+ if( ! m_handle )
-+ throw IOException();
-+
-+ throwOnError( gnome_vfs_tell( m_handle, &nBytesIn ) );
-+
-+ return nBytesIn;
-+}
-+
-+sal_Int64 SAL_CALL Stream::getLength()
-+ throw( IOException, RuntimeException )
-+{
-+ // FIXME: so this sucks; it may be stale but ...
-+ if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-+ return m_info.size;
-+ else {
-+ g_warning ("FIXME: No valid length");
-+ return 0;
-+ }
-+}
-+
-+// -------------------------------------------------------------------
-+// XTruncate
-+// -------------------------------------------------------------------
-+
-+void SAL_CALL Stream::truncate( void )
-+ throw( com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException )
-+{
-+ if( ! m_handle )
-+ throw IOException();
-+
-+ throwOnError( gnome_vfs_truncate_handle( m_handle, 0 ) );
-+}
-+
-+// -------------------------------------------------------------------
-+// XOutputStream
-+// -------------------------------------------------------------------
-+
-+void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData )
-+ throw( com::sun::star::io::NotConnectedException,
-+ com::sun::star::io::BufferSizeExceededException,
-+ com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException)
-+{
-+ GnomeVFSResult result = GNOME_VFS_OK;
-+ GnomeVFSFileSize toWrite = aData.getLength();
-+ const sal_Int8 *p = aData.getConstArray();
-+
-+ if( ! m_handle )
-+ throw IOException();
-+
-+ while( toWrite > 0) {
-+ GnomeVFSFileSize bytesWritten = 0;
-+
-+ result = gnome_vfs_write( m_handle, p, toWrite, &bytesWritten );
-+ if( result == GNOME_VFS_ERROR_INTERRUPTED )
-+ continue;
-+ throwOnError( result );
-+ g_assert( bytesWritten <= toWrite );
-+ toWrite -= bytesWritten;
-+ p += bytesWritten;
-+ }
-+}
-+
-+void SAL_CALL Stream::flush( void )
-+ throw( NotConnectedException, BufferSizeExceededException,
-+ IOException, RuntimeException )
-+{
-+}
-+
-+void SAL_CALL Stream::closeOutput( void )
-+ throw( com::sun::star::io::NotConnectedException,
-+ com::sun::star::io::IOException,
-+ com::sun::star::uno::RuntimeException )
-+{
-+ osl::MutexGuard aGuard( m_aMutex );
-+ m_bOutputStreamCalled = false;
-+
-+ if( ! m_bInputStreamCalled )
-+ closeStream();
-+}
-+
-+// -------------------------------------------------------------------
-+// Misc.
-+// -------------------------------------------------------------------
-+
-+void Stream::closeStream( void )
-+ throw( ::com::sun::star::io::NotConnectedException,
-+ ::com::sun::star::io::IOException,
-+ ::com::sun::star::uno::RuntimeException )
-+{
-+ if (m_handle) {
-+ gnome_vfs_close (m_handle);
-+ m_handle = NULL;
-+ } else
-+ throw IOException();
-+}
-+
-+void Stream::throwOnError( GnomeVFSResult result )
-+ throw( NotConnectedException,
-+ BufferSizeExceededException,
-+ IOException,
-+ RuntimeException )
-+{
-+ if( result != GNOME_VFS_OK ) {
-+ ::rtl::OUString aMsg = ::rtl::OUString::createFromAscii
-+ ( gnome_vfs_result_to_string( result ) );
-+
-+ g_warning( "Input Stream exceptional result '%s' (%d)",
-+ gnome_vfs_result_to_string( result ), result );
-+
-+ throw IOException( aMsg, static_cast< cppu::OWeakObject * >( this ) );
-+ }
-+}
+++ /dev/null
---- ucb/source/ucp/gvfs/ucpgvfs.xml
-+++ ucb/source/ucp/gvfs/ucpgvfs.xml
-@@ -0,0 +1,116 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+ <module-name>
-+ ucpgvfs
-+ </module-name>
-+
-+ <component-description>
-+ <author>
-+ Michael Meeks
-+ </author>
-+ <name>
-+ com.sun.star.comp.ucb.GnomeVFSProvider
-+ </name>
-+ <description>
-+ This component implements a Content Provider for the Universal
-+ Content Broker. It provides access to the Gnome VFS Virtual
-+ file system
-+ </description>
-+ <loader-name>
-+ com.sun.star.loader.SharedLibrary
-+ </loader-name>
-+ <language>
-+ c++
-+ </language>
-+ <status value="final"/>
-+ <supported-service>
-+ com.sun.star.ucb.GnomeVFSContentProvider
-+ </supported-service>
-+
-+ <service-dependency>
-+ com.sun.star.config.SpecialConfigManager
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.configuration.ConfigurationAccess
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.configuration.ConfigurationProvider
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.script.Converter
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.ucb.CachedDynamicResultSetStubFactory
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.ucb.Store
-+ </service-dependency>
-+ </component-description>
-+
-+ <project-build-dependency> sal </project-build-dependency>
-+ <project-build-dependency> cppu </project-build-dependency>
-+ <project-build-dependency> cppuhelper </project-build-dependency>
-+ <project-build-dependency> vos </project-build-dependency>
-+ <project-build-dependency> ucbhelper </project-build-dependency>
-+
-+ <runtime-module-dependency> sal3 </runtime-module-dependency>
-+ <runtime-module-dependency> cppu3 </runtime-module-dependency>
-+ <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency>
-+ <runtime-module-dependency> vos2$(COM) </runtime-module-dependency>
-+ <runtime-module-dependency> ucbhelper1$(COM) </runtime-module-dependency>
-+
-+ <type> com.sun.star.beans.Property </type>
-+ <type> com.sun.star.beans.PropertyAttribute </type>
-+ <type> com.sun.star.beans.PropertySetInfoChange </type>
-+ <type> com.sun.star.beans.PropertyState </type>
-+ <type> com.sun.star.beans.PropertyValue </type>
-+ <type> com.sun.star.beans.XPropertiesChangeNotifier </type>
-+ <type> com.sun.star.beans.XPropertyAccess </type>
-+ <type> com.sun.star.beans.XPropertyContainer </type>
-+ <type> com.sun.star.beans.XPropertySetInfo </type>
-+ <type> com.sun.star.beans.XPropertySetInfoChangeNotifier </type>
-+ <type> com.sun.star.container.XChild </type>
-+ <type> com.sun.star.container.XHierarchicalNameAccess </type>
-+ <type> com.sun.star.frame.ConfigManager </type>
-+ <type> com.sun.star.io.XActiveDataSink </type>
-+ <type> com.sun.star.io.XActiveDataStreamer </type>
-+ <type> com.sun.star.io.XSeekable </type>
-+ <type> com.sun.star.io.XStream </type>
-+ <type> com.sun.star.lang.XMultiServiceFactory </type>
-+ <type> com.sun.star.lang.XServiceInfo </type>
-+ <type> com.sun.star.lang.XSingleServiceFactory </type>
-+ <type> com.sun.star.lang.XTypeProvider </type>
-+ <type> com.sun.star.registry.XRegistryKey </type>
-+ <type> com.sun.star.script.XTypeConverter </type>
-+ <type> com/sun/star/sdbc/ColumnValue </type>
-+ <type> com.sun.star.sdbc.XCloseable </type>
-+ <type> com.sun.star.sdbc.XResultSetMetaDataSupplier </type>
-+ <type> com.sun.star.sdbc.XRow </type>
-+ <type> com.sun.star.ucb.ContentAction </type>
-+ <type> com.sun.star.ucb.ContentInfoAttribute </type>
-+ <type> com.sun.star.ucb.FileSystemNotation </type>
-+ <type> com.sun.star.ucb.InsertCommandArgument </type>
-+ <type> com.sun.star.ucb.InteractiveBadTransferURLException </type>
-+ <type> com.sun.star.ucb.ListAction </type>
-+ <type> com.sun.star.ucb.NameClash </type>
-+ <type> com.sun.star.ucb.NumberedSortingInfo </type>
-+ <type> com.sun.star.ucb.OpenCommandArgument2 </type>
-+ <type> com.sun.star.ucb.OpenMode </type>
-+ <type> com.sun.star.ucb.TransferInfo </type>
-+ <type> com.sun.star.ucb.WelcomeDynamicResultSetStruct </type>
-+ <type> com.sun.star.ucb.XCachedDynamicResultSetStubFactory </type>
-+ <type> com.sun.star.ucb.XCommandInfo </type>
-+ <type> com.sun.star.ucb.XCommandProcessor </type>
-+ <type> com.sun.star.ucb.XContentAccess </type>
-+ <type> com.sun.star.ucb.XContentCreator </type>
-+ <type> com.sun.star.ucb.XContentIdentifier </type>
-+ <type> com.sun.star.ucb.XContentIdentifierFactory </type>
-+ <type> com.sun.star.ucb.XContentProvider </type>
-+ <type> com.sun.star.ucb.XDynamicResultSet </type>
-+ <type> com.sun.star.ucb.XFileIdentifierConverter </type>
-+ <type> com.sun.star.ucb.XPropertySetRegistryFactory </type>
-+ <type> com.sun.star.ucb.XSourceInitialization </type>
-+ <type> com.sun.star.uno.XWeak </type>
-+</module-description>
---- ucb/source/ucp/gvfs/makefile.mk
-+++ ucb/source/ucp/gvfs/makefile.mk
-@@ -0,0 +1,58 @@
-+PRJ=..$/..$/..
-+PRJNAME=ucb
-+TARGET=ucpgvfs
-+ENABLE_EXCEPTIONS=TRUE
-+NO_BSYMBOLIC=TRUE
-+
-+# Version
-+UCPGVFS_MAJOR=1
-+
-+.INCLUDE: svpre.mk
-+.INCLUDE: settings.mk
-+.INCLUDE: sv.mk
-+
-+SLOFILES=\
-+ $(SLO)$/content.obj \
-+ $(SLO)$/directory.obj \
-+ $(SLO)$/stream.obj \
-+ $(SLO)$/provider.obj
-+
-+CFLAGS+=`pkg-config --cflags gnome-vfs-2.0`
-+CFLAGS+=-Wall
-+
-+LIB1TARGET=$(SLB)$/_$(TARGET).lib
-+LIB1OBJFILES=$(SLOFILES)
-+
-+SHL1TARGET=$(TARGET)$(UCPGVFS_MAJOR)
-+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-+SHL1LIBS=$(LIB1TARGET)
-+SHL1IMPLIB=i$(TARGET)
-+SHL1STDLIBS=\
-+ $(CPPUHELPERLIB) \
-+ $(CPPULIB) \
-+ $(SALLIB) \
-+ $(VOSLIB) \
-+ $(UCBHELPERLIB) \
-+ $(UNOTOOLSLIB) \
-+ `pkg-config --libs gnome-vfs-2.0`
-+
-+
-+DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
-+DEF1NAME=$(SHL1TARGET)
-+DEF1EXPORT1 =component_getImplementationEnvironment
-+DEF1EXPORT2 =component_writeInfo
-+DEF1EXPORT3 =component_getFactory
-+DEF1DES=UCB : Gnome VFS System Content Provider
-+
-+.INCLUDE: target.mk
-+
-+$(MISC)$/$(SHL1TARGET).flt:
-+ @echo ------------------------------
-+ @echo Making: $@
-+ @echo cpp >> $@
-+ @echo m_ >> $@
-+ @echo rtl >> $@
-+ @echo vos >> $@
-+ @echo component_getImplementationEnvironment >> $@
-+ @echo component_writeInfo >> $@
-+ @echo component_getFactory >> $@
-Index: ucb/prj/build.lst
-===================================================================
-RCS file: /cvs/ucb/ucb/prj/build.lst,v
-retrieving revision 1.11
-diff -u -p -u -r1.11 build.lst
---- ucb/prj/build.lst 27 Mar 2003 17:26:37 -0000 1.11
-+++ ucb/prj/build.lst 13 May 2003 20:58:30 -0000
-@@ -8,6 +8,7 @@ uc ucb\source\cacher nmake - all uc
- uc ucb\source\sorter nmake - all uc_sorter uc_unotypes NULL
- uc ucb\source\ucp\ftp nmake - all uc_ftp uc_unotypes NULL
- uc ucb\source\ucp\file nmake - all uc_file uc_unotypes NULL
-+uc ucb\source\ucp\gvfs nmake - all uc_gvfs uc_unotypes NULL
- uc ucb\source\ucp\hierarchy nmake - all uc_hierarchy uc_unotypes NULL
- uc ucb\source\ucp\remote nmake - all uc_remote uc_regexp NULL
- uc ucb\source\ucp\webdav nmake - all uc_webdav uc_unotypes NULL
+++ /dev/null
-Index: ucb/prj/d.lst
-===================================================================
-RCS file: /cvs/oo/ucb/ucb/prj/d.lst,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 d.lst
---- ucb/prj/d.lst 2 Aug 2001 16:18:32 -0000 1.10
-+++ ucb/prj/d.lst 1 Apr 2003 15:21:28 -0000
-@@ -27,6 +27,7 @@
- ..\source\ucp\package\ucppkg.xml %_DEST%\xml%_EXT%\ucppkg.xml
- ..\source\ucp\remote\ucprmt.xml %_DEST%\xml%_EXT%\ucprmt.xml
- ..\source\ucp\webdav\ucpdav.xml %_DEST%\xml%_EXT%\ucpdav.xml
-+..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml
-
- ..\%__SRC%\bin\ucb.exe %_DEST%\bin%_EXT%\ucb.exe
- ..\%__SRC%\bin\ucb %_DEST%\bin%_EXT%\ucb.bin
---- ucb/source/ucp/gvfs/ucpgvfs.xml 2003-04-01 16:22:25.000000000 +0100
-+++ ucb/source/ucp/gvfs/ucpgvfs.xml 2003-04-01 16:22:25.000000000 +0100
-@@ -0,0 +1,116 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-+
-+ <module-name>
-+ ucpgvfs
-+ </module-name>
-+
-+ <component-description>
-+ <author>
-+ Michael Meeks
-+ </author>
-+ <name>
-+ com.sun.star.comp.ucb.GnomeVFSProvider
-+ </name>
-+ <description>
-+ This component implements a Content Provider for the Universal
-+ Content Broker. It provides access to the Gnome VFS Virtual
-+ file system
-+ </description>
-+ <loader-name>
-+ com.sun.star.loader.SharedLibrary
-+ </loader-name>
-+ <language>
-+ c++
-+ </language>
-+ <status value="final"/>
-+ <supported-service>
-+ com.sun.star.ucb.GnomeVFSContentProvider
-+ </supported-service>
-+
-+ <service-dependency>
-+ com.sun.star.config.SpecialConfigManager
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.configuration.ConfigurationAccess
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.configuration.ConfigurationProvider
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.script.Converter
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.ucb.CachedDynamicResultSetStubFactory
-+ </service-dependency>
-+ <service-dependency>
-+ com.sun.star.ucb.Store
-+ </service-dependency>
-+ </component-description>
-+
-+ <project-build-dependency> sal </project-build-dependency>
-+ <project-build-dependency> cppu </project-build-dependency>
-+ <project-build-dependency> cppuhelper </project-build-dependency>
-+ <project-build-dependency> vos </project-build-dependency>
-+ <project-build-dependency> ucbhelper </project-build-dependency>
-+
-+ <runtime-module-dependency> sal3 </runtime-module-dependency>
-+ <runtime-module-dependency> cppu3 </runtime-module-dependency>
-+ <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency>
-+ <runtime-module-dependency> vos2$(COM) </runtime-module-dependency>
-+ <runtime-module-dependency> ucbhelper1$(COM) </runtime-module-dependency>
-+
-+ <type> com.sun.star.beans.Property </type>
-+ <type> com.sun.star.beans.PropertyAttribute </type>
-+ <type> com.sun.star.beans.PropertySetInfoChange </type>
-+ <type> com.sun.star.beans.PropertyState </type>
-+ <type> com.sun.star.beans.PropertyValue </type>
-+ <type> com.sun.star.beans.XPropertiesChangeNotifier </type>
-+ <type> com.sun.star.beans.XPropertyAccess </type>
-+ <type> com.sun.star.beans.XPropertyContainer </type>
-+ <type> com.sun.star.beans.XPropertySetInfo </type>
-+ <type> com.sun.star.beans.XPropertySetInfoChangeNotifier </type>
-+ <type> com.sun.star.container.XChild </type>
-+ <type> com.sun.star.container.XHierarchicalNameAccess </type>
-+ <type> com.sun.star.frame.ConfigManager </type>
-+ <type> com.sun.star.io.XActiveDataSink </type>
-+ <type> com.sun.star.io.XActiveDataStreamer </type>
-+ <type> com.sun.star.io.XSeekable </type>
-+ <type> com.sun.star.io.XStream </type>
-+ <type> com.sun.star.lang.XMultiServiceFactory </type>
-+ <type> com.sun.star.lang.XServiceInfo </type>
-+ <type> com.sun.star.lang.XSingleServiceFactory </type>
-+ <type> com.sun.star.lang.XTypeProvider </type>
-+ <type> com.sun.star.registry.XRegistryKey </type>
-+ <type> com.sun.star.script.XTypeConverter </type>
-+ <type> com/sun/star/sdbc/ColumnValue </type>
-+ <type> com.sun.star.sdbc.XCloseable </type>
-+ <type> com.sun.star.sdbc.XResultSetMetaDataSupplier </type>
-+ <type> com.sun.star.sdbc.XRow </type>
-+ <type> com.sun.star.ucb.ContentAction </type>
-+ <type> com.sun.star.ucb.ContentInfoAttribute </type>
-+ <type> com.sun.star.ucb.FileSystemNotation </type>
-+ <type> com.sun.star.ucb.InsertCommandArgument </type>
-+ <type> com.sun.star.ucb.InteractiveBadTransferURLException </type>
-+ <type> com.sun.star.ucb.ListAction </type>
-+ <type> com.sun.star.ucb.NameClash </type>
-+ <type> com.sun.star.ucb.NumberedSortingInfo </type>
-+ <type> com.sun.star.ucb.OpenCommandArgument2 </type>
-+ <type> com.sun.star.ucb.OpenMode </type>
-+ <type> com.sun.star.ucb.TransferInfo </type>
-+ <type> com.sun.star.ucb.WelcomeDynamicResultSetStruct </type>
-+ <type> com.sun.star.ucb.XCachedDynamicResultSetStubFactory </type>
-+ <type> com.sun.star.ucb.XCommandInfo </type>
-+ <type> com.sun.star.ucb.XCommandProcessor </type>
-+ <type> com.sun.star.ucb.XContentAccess </type>
-+ <type> com.sun.star.ucb.XContentCreator </type>
-+ <type> com.sun.star.ucb.XContentIdentifier </type>
-+ <type> com.sun.star.ucb.XContentIdentifierFactory </type>
-+ <type> com.sun.star.ucb.XContentProvider </type>
-+ <type> com.sun.star.ucb.XDynamicResultSet </type>
-+ <type> com.sun.star.ucb.XFileIdentifierConverter </type>
-+ <type> com.sun.star.ucb.XPropertySetRegistryFactory </type>
-+ <type> com.sun.star.ucb.XSourceInitialization </type>
-+ <type> com.sun.star.uno.XWeak </type>
-+</module-description>
-Index: officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 Configuration.xcu
---- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 8 Nov 2002 16:50:28 -0000 1.4
-+++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 13 May 2003 20:52:35 -0000
-@@ -154,6 +154,17 @@
- <value/>
- </prop>
- </node>
-+ <node oor:name="Provider9" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.GnomeVFSContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>.*</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
- </node>
- </node>
- </node>
-Index: scp/source/office/files.scp
-===================================================================
-RCS file: /cvs/installation/scp/source/office/files.scp,v
-retrieving revision 1.367
-diff -u -p -u -r1.367 files.scp
---- scp/source/office/files.scp 17 Jul 2003 08:54:46 -0000 1.367
-+++ scp/source/office/files.scp 5 Aug 2003 14:48:48 -0000
-@@ -879,6 +883,9 @@ SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_PACKAG
-
- SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_UCPHIER1,ucphier1)
- SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_UCPDAV1,ucpdav1)
-+#ifdef UNX
-+SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_UCPGVFS1,ucpgvfs1)
-+#endif
- SPECIAL_UNO_LIB_FILE(GID_FILE_LIB_FILEACC,fileacc)
- SPECIAL_UNO_COMPONENT_LIB_FILE(GID_FILE_LIB_TINSTRM,textinstream.uno)
- SPECIAL_UNO_COMPONENT_LIB_FILE(GID_FILE_LIB_TOUTSTRM,textoutstream.uno)
+++ /dev/null
-Index: tools/bootstrp/static.mk
-===================================================================
-RCS file: /cvs/util/tools/bootstrp/static.mk,v
-retrieving revision 1.26
-diff -u -p -u -r1.26 static.mk
---- tools/bootstrp/static.mk 15 Apr 2003 17:55:11 -0000 1.26
-+++ tools/bootstrp/static.mk 14 May 2003 08:02:07 -0000
-@@ -146,6 +146,7 @@ STATIC_LIBS += -lX11 -lXext
- .ELSE
- STATIC_LIBS += -lsupc++ -lX11 -lXext
- .ENDIF
-+STATIC_LIBS += `pkg-config --libs gnome-vfs-2.0`
- .ENDIF
-
- # -----------------------------------------------------------
-Index: tools/source/fsys/makefile.mk
-===================================================================
-RCS file: /cvs/util/tools/source/fsys/makefile.mk,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 makefile.mk
---- tools/source/fsys/makefile.mk 30 Apr 2003 08:25:46 -0000 1.7
-+++ tools/source/fsys/makefile.mk 14 May 2003 08:02:07 -0000
-@@ -101,6 +101,8 @@ OBJFILES= $(OBJ)$/wldcrd.obj \
- $(OBJ)$/tdir.obj \
- $(OBJ)$/urlobj.obj
-
-+CFLAGS+=`pkg-config --cflags gnome-vfs-2.0`
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
-Index: tools/source/fsys/urlobj.cxx
-===================================================================
-RCS file: /cvs/util/tools/source/fsys/urlobj.cxx,v
-retrieving revision 1.37
-diff -u -p -u -r1.37 urlobj.cxx
---- tools/source/fsys/urlobj.cxx 24 Apr 2003 13:27:52 -0000 1.37
-+++ tools/source/fsys/urlobj.cxx 14 May 2003 08:02:10 -0000
-@@ -107,6 +107,43 @@
- #define INCLUDED_LIMITS
- #endif
-
-+#ifndef _VOS_MUTEX_HXX
-+#include <vos/mutex.hxx>
-+#endif
-+
-+#include <stdio.h>
-+#include <signal.h>
-+
-+#include <libgnomevfs/gnome-vfs.h>
-+
-+#undef USE_GNOME_VFS_2_2
-+
-+#ifdef USE_GNOME_VFS_2_2
-+extern "C" {
-+ GList *_gnome_vfs_configuration_get_methods_list (void);
-+}
-+#endif
-+
-+static GList *
-+get_methods_list (void)
-+{
-+#ifdef USE_GNOME_VFS_2_2
-+ return _gnome_vfs_configuration_get_methods_list ();
-+#else
-+ /* This sucks utterly */
-+ const char *methods[] = {
-+ "smb", "pipe", "ssh", "nntp", "gnome-help", "preferences", "ncp",
-+ "applications", "favorites", "cdda", "system", "nfs", "camera"
-+// "mailfs", "hp8", "patchfs" - broken extfs stuff ...
-+ };
-+ int i;
-+ GList *ret = NULL;
-+ for (i = 0; i < G_N_ELEMENTS (methods); i++)
-+ ret = g_list_prepend (ret, (void *) methods [i]);
-+ return ret;
-+#endif
-+}
-+
- namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj;
- // unnamed namespaces don't work well yet...
-
-@@ -393,6 +430,8 @@ struct INetURLObject::PrefixInfo
- };
-
- //============================================================================
-+static INetURLObject::SchemeInfo *vfs_schemeinfo_map = NULL;
-+
- static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END]
- = { { "", "", 0, false, false, false, false, false, false, false,
- false },
-@@ -459,7 +498,10 @@ static INetURLObject::SchemeInfo const a
- inline INetURLObject::SchemeInfo const &
- INetURLObject::getSchemeInfo(INetProtocol eTheScheme)
- {
-- return aSchemeInfoMap[eTheScheme];
-+ if (eTheScheme >= INET_PROT_END)
-+ return vfs_schemeinfo_map [eTheScheme - INET_PROT_END];
-+ else
-+ return aSchemeInfoMap[eTheScheme];
- };
-
- //============================================================================
-@@ -720,15 +762,21 @@ bool INetURLObject::setAbsURIRef(UniStri
- // Parse <scheme>:
- sal_Unicode const * p = pPos;
- PrefixInfo const * pPrefix = getPrefix(p, pEnd);
-+ ::rtl::OString tmpStr (rTheAbsURIRef.GetBuffer (),
-+ rTheAbsURIRef.Len (),
-+ RTL_TEXTENCODING_UTF8);
-+
-+ // fprintf (stderr, "setAbsURIRef '%s' %d\n", tmpStr.getStr(),
-+ // (int) (pPrefix ? pPrefix->m_eScheme : -17));
- if (pPrefix)
- {
- pPos = p;
- m_eScheme = pPrefix->m_eScheme;
- aSynAbsURIRef
- = UniString::CreateFromAscii(pPrefix->m_eKind
-- >= PrefixInfo::EXTERNAL ?
-- pPrefix->m_pTranslatedPrefix :
-- pPrefix->m_pPrefix);
-+ >= PrefixInfo::EXTERNAL ?
-+ pPrefix->m_pTranslatedPrefix :
-+ pPrefix->m_pPrefix);
- }
- else
- {
-@@ -871,6 +919,8 @@ bool INetURLObject::setAbsURIRef(UniStri
- sal_Unicode const * pHostPortBegin = 0;
- sal_Unicode const * pHostPortEnd = 0;
-
-+// fprintf (stderr, "Got Authority\n");
-+
- switch (m_eScheme)
- {
- case INET_PROT_VND_SUN_STAR_HELP:
-@@ -1170,6 +1220,7 @@ bool INetURLObject::setAbsURIRef(UniStri
- && !(m_eScheme == INET_PROT_FILE
- && pPos != pEnd && *pPos == '/'))
- {
-+// fprintf (stderr, "not smart\n");
- setInvalid();
- return false;
- }
-@@ -1211,6 +1262,7 @@ bool INetURLObject::setAbsURIRef(UniStri
- }
- else if (pPos != pAuthority)
- {
-+// fprintf (stderr, "bogus auth\n");
- setInvalid();
- return false;
- }
-@@ -1290,6 +1342,7 @@ bool INetURLObject::setAbsURIRef(UniStri
- eEscapeType);
- if (!INetMIME::isIMAPAtomChar(nUTF32))
- {
-+// fprintf (stderr, "bogus char\n");
- setInvalid();
- return false;
- }
-@@ -1329,14 +1382,17 @@ bool INetURLObject::setAbsURIRef(UniStri
- case INET_PROT_LDAP:
- if (pHostPortBegin == pPort && pPort != pHostPortEnd)
- {
-+// fprintf (stderr, "bogus port 0\n");
- setInvalid();
- return false;
- }
- break;
-
- default:
-- if (pHostPortBegin == pPort)
-+ if (m_eScheme < INET_PROT_END && /* else might have a port */
-+ pHostPortBegin == pPort)
- {
-+// fprintf (stderr, "bogus port\n");
- setInvalid();
- return false;
- }
-@@ -1346,6 +1402,7 @@ bool INetURLObject::setAbsURIRef(UniStri
- if (!parseHost(pHostPortBegin, pPort, bOctets, eMechanism, eCharset,
- bNetBiosName, &aSynHost))
- {
-+// fprintf (stderr, "bogus host\n");
- setInvalid();
- return false;
- }
-@@ -1360,6 +1417,10 @@ bool INetURLObject::setAbsURIRef(UniStri
- }
- }
-
-+// ::rtl::OString tmpStrPP (pPos, pEnd - pPos,
-+// RTL_TEXTENCODING_UTF8);
-+// fprintf (stderr, "Pre path parse '%s'\n", tmpStrPP.getStr());
-+
- // Parse <path>
- UniString aSynPath;
- if (!parsePath(m_eScheme, &pPos, pEnd, bOctets, eMechanism, eCharset,
-@@ -1368,6 +1429,7 @@ bool INetURLObject::setAbsURIRef(UniStri
- getSchemeInfo().m_bQuery ? '?' : 0x80000000,
- nFragmentDelimiter, &aSynPath))
- {
-+// fprintf (stderr, "Invalid path\n");
- setInvalid();
- return false;
- }
-@@ -1407,12 +1469,20 @@ bool INetURLObject::setAbsURIRef(UniStri
-
- if (pPos != pEnd)
- {
-+// ::rtl::OString tmpStrZ (pPos, pEnd - pPos,
-+// RTL_TEXTENCODING_UTF8);
-+// fprintf (stderr, "Invalid fragment '%s'\n", tmpStrZ.getStr());
- setInvalid();
- return false;
- }
-
- m_aAbsURIRef = aSynAbsURIRef;
-
-+// ::rtl::OString tmpStr2 (aSynAbsURIRef.GetBuffer (),
-+// aSynAbsURIRef.Len (),
-+// RTL_TEXTENCODING_UTF8);
-+// fprintf (stderr, "setAbsURIRef result '%s'\n", tmpStr2.getStr());
-+
- return true;
- }
-
-@@ -1422,13 +1492,13 @@ INetURLObject INetURLObject::m_aBaseURIR
-
- //============================================================================
- bool INetURLObject::convertRelToAbs(UniString const & rTheRelURIRef,
-- bool bOctets,
-- INetURLObject & rTheAbsURIRef,
-- bool & rWasAbsolute,
-- EncodeMechanism eMechanism,
-- rtl_TextEncoding eCharset,
-- bool bIgnoreFragment, bool bSmart,
-- bool bRelativeNonURIs, FSysStyle eStyle)
-+ bool bOctets,
-+ INetURLObject & rTheAbsURIRef,
-+ bool & rWasAbsolute,
-+ EncodeMechanism eMechanism,
-+ rtl_TextEncoding eCharset,
-+ bool bIgnoreFragment, bool bSmart,
-+ bool bRelativeNonURIs, FSysStyle eStyle)
- const
- {
- sal_Unicode const * p = rTheRelURIRef.GetBuffer();
-@@ -1443,6 +1513,11 @@ bool INetURLObject::convertRelToAbs(UniS
- sal_uInt32 nFragmentDelimiter = '#';
- Part ePart = PART_VISIBLE;
-
-+// if (pPrefix)
-+// fprintf (stderr, "Got pPrefix\n");
-+// else
-+// fprintf (stderr, "No pPrefix\n");
-+
- if (!pPrefix && bSmart)
- {
- // If the input matches any of the following productions (for which
-@@ -1545,9 +1620,12 @@ bool INetURLObject::convertRelToAbs(UniS
- // Fast solution for non-relative URIs:
- if (pPrefix)
- {
-+// fprintf (stderr, "Fast pPrefix path\n");
-+
- INetURLObject aNewURI(rTheRelURIRef, eMechanism, eCharset);
- if (aNewURI.HasError())
- {
-+// fprintf (stderr, "Had error!\n");
- rWasAbsolute = false;
- return false;
- }
-@@ -1555,14 +1633,22 @@ bool INetURLObject::convertRelToAbs(UniS
- if (bIgnoreFragment)
- aNewURI.clearFragment();
- rTheAbsURIRef = aNewURI;
-+
-+// ::rtl::OString tmpStr2 (m_aAbsURIRef.GetBuffer (),
-+// m_aAbsURIRef.Len (),
-+// RTL_TEXTENCODING_UTF8);
-+// fprintf (stderr, "Hard set to '%s' \n", tmpStr2.getStr());
-+
- return true;
- }
-
-+// fprintf (stderr, "Slow non pPrefix path\n");
-+
- enum State { STATE_AUTH, STATE_ABS_PATH, STATE_REL_PATH, STATE_FRAGMENT,
- STATE_DONE };
-
- UniString aSynAbsURIRef(UniString::CreateFromAscii(getSchemeInfo().
-- m_pScheme));
-+ m_pScheme));
- aSynAbsURIRef += ':';
-
- sal_Char cEscapePrefix = getEscapePrefix();
-@@ -2082,13 +2168,95 @@ INetURLObject::getPrefix(sal_Unicode con
- { "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 }
-+ };
-+
-+ static GHashTable *fast_lookup = NULL;
-+ int i;
-+
-+ if (!fast_lookup) {
-+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+ if (!fast_lookup) {
-+ // FIXME: This code should be re-factored, but C++ is
-+ // broken by design for re-factoring.
-+ GList *methods, *l;
-+
-+ fast_lookup = g_hash_table_new (g_str_hash, g_str_equal);
-+
-+ for (i = 1; i < G_N_ELEMENTS (aMap); i++) {
-+ g_hash_table_insert (fast_lookup, (void *) aMap[i].m_pPrefix,
-+ (void *) (aMap + i));
-+ }
-+
-+ methods = get_methods_list ();
-+ vfs_schemeinfo_map = g_new0 (INetURLObject::SchemeInfo, g_list_length (methods));
-+
-+ i = INET_PROT_END;
-+ for (l = methods; l; l = l->next) {
-+ PrefixInfo *pi;
-+ INetURLObject::SchemeInfo *si;
-+ char *name;
-+
-+ name = g_strconcat ((gchar *) l->data, ":", NULL);
-+
-+ // g_warning ("AddV '%s'", name);
-+ if (g_hash_table_lookup (fast_lookup, name)) {
-+ fprintf (stderr, "Discarding URI scheme '%s'", name);
-+ g_free (name);
-+ continue;
-+ }
-+
-+ pi = new PrefixInfo;
-+
-+ pi->m_pPrefix = (sal_Char *) name;
-+ pi->m_pTranslatedPrefix = NULL;
-+ pi->m_eScheme = (INetProtocol) i;
-+ pi->m_eKind = PrefixInfo::OFFICIAL;
-+
-+ si = &vfs_schemeinfo_map [i - INET_PROT_END];
-+
-+ si->m_pScheme = (sal_Char *) l->data;
-+ si->m_pPrefix = g_strconcat (name, "//", NULL); // what a waste
-+
-+ // FIXME: these are just wrong, set all to true ?
-+ si->m_nDefaultPort = 0;
-+ si->m_bAuthority = true;
-+ si->m_bUser = false;
-+ si->m_bAuth = false;
-+ si->m_bPassword = false;
-+ si->m_bHost = true;
-+ si->m_bPort = false;
-+ si->m_bHierarchical = true;
-+ si->m_bQuery = false;
-+
-+ g_hash_table_insert (fast_lookup, (void *) pi->m_pPrefix, (void *) pi);
-+ i++;
-+ }
-+ }
-+
-+ // FIXME: add write barrier when this reaches OOO_STABLE_1
-+ }
-+
-+ char *rstr;
-+
-+ rstr = (char *) g_alloca (pEnd - rBegin + 2);
-+ for (i = 0; i < pEnd - rBegin && rBegin [i] != ':'; i++)
-+ rstr[i] = INetMIME::toLowerCase (rBegin [i]);
-+ if (i >= pEnd - rBegin) return NULL;
-+ rstr [i++] = ':'; rstr [i] = '\0';
-+
-+ const PrefixInfo *pi;
-+
-+ pi = (PrefixInfo *) g_hash_table_lookup (fast_lookup, rstr);
-+
-+// g_warning ("Lookup '%s' -> %d", rstr, (int) (pi ? pi->m_eScheme : -17));
-+
-+ if (pi)
-+ rBegin += i;
-+
-+ return pi;
-+
-+#ifdef OVER_COMPLICATED_CODE
- for (; pFirst < pLast; ++i)
- {
- if (pFirst->m_pPrefix[i] == '\0')
-@@ -2120,7 +2288,9 @@ INetURLObject::getPrefix(sal_Unicode con
- }
- }
- rBegin = pMatched;
-+
- return pMatch;
-+#endif
- }
-
- //============================================================================
-@@ -2359,7 +2529,7 @@ bool INetURLObject::setHost(UniString co
- break;
-
- default:
-- if (aSynHost.Len() == 0)
-+ if (aSynHost.Len() == 0 && m_eScheme < INET_PROT_END)
- return false;
- break;
- }
-@@ -2436,6 +2606,7 @@ bool INetURLObject::parsePath(INetProtoc
- aTheSynPath = '/';
- break;
-
-+ default: /* All INET_PROT_END+ drop through here */
- case INET_PROT_FILE:
- case INET_PROT_VND_SUN_STAR_WFS:
- {
-@@ -3618,7 +3789,8 @@ bool INetURLObject::ConcatData(INetProto
- break;
-
- default:
-- if (aSynHost.Len() == 0)
-+ if (aSynHost.Len() == 0 &&
-+ m_eScheme < INET_PROT_END) /* valid perhaps */
- {
- setInvalid();
- return false;
-Index: tools/util/makefile.mk
-===================================================================
-RCS file: /cvs/util/tools/util/makefile.mk,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 makefile.mk
---- tools/util/makefile.mk 30 Apr 2003 08:25:57 -0000 1.10
-+++ tools/util/makefile.mk 14 May 2003 08:02:10 -0000
-@@ -200,6 +200,10 @@ SHL1STDLIBS+= shell32.lib \
- uuid.lib \
- advapi32.lib
- .ENDIF
-+.IF "$(GUI)"=="UNX"
-+SHL1STDLIBS+=`pkg-config --libs gnome-vfs-2.0`
-+.ENDIF
-+
-
- DEF1NAME =$(SHL1TARGET)
- DEF1DEPN = \
+++ /dev/null
---- vcl/unx/source/app/wmadaptor.cxx
-+++ vcl/unx/source/app/wmadaptor.cxx
-@@ -1399,13 +1399,8 @@
- switch( eType )
- {
- case windowType_Utility:
--#if 0
-- // advertise tool windows as dialogues not utilities for now
-- // due to a bug in metacity 2.4.34 (smaller titlebar font on
-- // resizable utility windows)
- eWMType = m_aWMAtoms[ NET_WM_WINDOW_TYPE_UTILITY ] ? NET_WM_WINDOW_TYPE_UTILITY : NET_WM_WINDOW_TYPE_DIALOG;
- break;
--#endif
- case windowType_ModelessDialogue:
- case windowType_ModalDialogue:
- eWMType = NET_WM_WINDOW_TYPE_DIALOG;
+++ /dev/null
-Index: sw/inc/cmdid.h
-===================================================================
-RCS file: /cvs/sw/sw/inc/cmdid.h,v
-retrieving revision 1.46
-diff -u -p -u -r1.46 cmdid.h
---- sw/inc/cmdid.h 22 May 2003 08:40:37 -0000 1.46
-+++ sw/inc/cmdid.h 31 Jul 2003 17:01:16 -0000
-@@ -749,6 +749,7 @@ Achtung: Ab sofort sind in diesem File k
- #define FN_MACRO_POPUP (FN_EXTRA + 37) /* Alle Macrofunktionen */
- #define FN_BULLET (FN_EXTRA + 38) /* Bullet-Liste */
-
-+#define FN_WORD_COUNT_DLG (FN_EXTRA + 39)
-
- // Bereich: Gloassaries
-
-Index: sw/sdi/swriter.sdi
-===================================================================
-RCS file: /cvs/sw/sw/sdi/swriter.sdi,v
-retrieving revision 1.43
-diff -u -p -u -r1.43 swriter.sdi
---- sw/sdi/swriter.sdi 22 May 2003 08:42:09 -0000 1.43
-+++ sw/sdi/swriter.sdi 31 Jul 2003 17:01:17 -0000
-@@ -8482,6 +8482,29 @@ SfxBoolItem UnderlineDouble FN_UNDERLINE
- ]
-
- //--------------------------------------------------------------------------
-+SfxVoidItem WordCount FN_WORD_COUNT_DLG
-+()
-+[
-+ /* flags: */
-+ AutoUpdate = FALSE,
-+ Cachable = Cachable,
-+ FastCall = FALSE,
-+ HasCoreId = FALSE,
-+ HasDialog = TRUE,
-+ ReadOnlyDoc = TRUE,
-+ Toggle = TRUE,
-+ Container = FALSE,
-+ Asynchron;
-+
-+ /* config: */
-+ AccelConfig = TRUE,
-+ MenuConfig = TRUE,
-+ StatusBarConfig = FALSE,
-+ ToolBoxConfig = TRUE,
-+ GroupId = GID_DOCUMENT;
-+]
-+
-+//--------------------------------------------------------------------------
- SfxVoidItem UnhainFrames FN_FRAME_UNCHAIN
-
- [
-Index: sw/sdi/swslots.src
-===================================================================
-RCS file: /cvs/sw/sw/sdi/swslots.src,v
-retrieving revision 1.109
-diff -u -p -u -r1.109 swslots.src
---- sw/sdi/swslots.src 17 Jul 2003 11:48:28 -0000 1.109
-+++ sw/sdi/swslots.src 31 Jul 2003 17:01:27 -0000
-@@ -3685,6 +3685,52 @@ SfxSlotInfo FN_HYPHENATE_OPT_DLG
- SlotName[ hindi ] = "à€čà€Ÿà€à€«à€šà„à€¶à€š";
- SlotName[ slovak ] = "Delenie slov";
- };
-+SfxSlotInfo FN_WORD_COUNT_DLG
-+{
-+ SlotName = "Wörter zÀhlen...";
-+ SlotName[ arabic ] = "Ă
ĂĂĂĂĂĂĂ";
-+ SlotName[ english ] = "Word count";
-+ SlotName[ english_us ] = "Word count";
-+ SlotName[ catalan ] = "Comptador de paraules";
-+ SlotName[ czech ] = "PoĂ?et slov";
-+ SlotName[ danish ] = "OrdoptĂŠlling";
-+ SlotName[ greek ] = "Ă?Ă?ĂÂŻĂžĂÂŒĂ·Ă?Ă· Ă?ĂÂĂŸĂ”Ă?ĂÂœ";
-+ SlotName[ spanish ] = "Contar palabras";
-+ SlotName[ estonian ] = "SÔnade arv";
-+ SlotName[ finnish ] = "Laske sanat";
-+ SlotName[ french ] = "Statistiques";
-+ SlotName[ hindi ] = "à €¶à €à „?à €Š à €?à €¿à €šà „?à €?";
-+ SlotName[ italian ] = "Statistiche";
-+ SlotName[ hungarian ] = "Szavak szĂĄma";
-+ SlotName[ japanese ] = "ĂŁ?ÂŻĂŁ?ÂŒĂŁ??ĂŁ?«ã?Šã?³ã??";
-+ SlotName[ korean ] = "Ă?”ĂȘÂł?";
-+ SlotName[ norwegian ] = "Ordtelling";
-+ SlotName[ dutch ] = "Woorden tellen";
-+ SlotName[ polish ] = "Liczba s³ów";
-+ SlotName[ portuguese ] = "Contagem palavras";
-+ SlotName[ portuguese_brazilian ] = "Contagem palavras";
-+ SlotName[ russian ] = "Ă?ĂŸĂ»ĂžĂ?Ă”Ă?Ă?ĂÂČĂŸ Ă?Ă»ĂŸĂÂČ";
-+ SlotName[ slovak ] = "PoĂ?et slov";
-+ SlotName[ swedish ] = "OrdrÀkning";
-+ SlotName[ turkish ] = "Ăstatistik";
-+ SlotName[ chinese_simplified ] = "ç»?ڟ¥";
-+ SlotName[ chinese_traditional ] = "由ښ?";
-+/* --: "Word count" translations
-+ az: "K�lm� Miqdarñ"
-+ bs: "Zbir rijeĂ?i"
-+ cy: "Cyfrif geiriau"
-+ eu: "Hitz kopurua"
-+ mk: "Ă?Ă?ĂŸĂ”Ă?Ă” ĂÂœĂ° Ă·Ă±ĂŸĂ?ĂŸĂÂČĂž"
-+ mt: "Gçadd taù?? kliem"
-+ ro: "NumĂ?rĂ? cuvintele"
-+ sl: "Ă
tevilo besed"
-+ sq: "Llogariti fjalët"
-+ ta: "Ă Âź?Ă ÂŻ?Ă ÂźÂČĂ ÂŻ? Ă Âź?à Ÿ£à ¯?à Ÿ£à Ÿ¿"
-+ uk: "Ă?Ă?Ă»Ă?ĂÂșĂ?Ă?Ă?Ă? Ă?Ă»Ă?ĂÂČ"
-+ vi: "Ă?ĂĄÂșÂżm t廫"
-+ wa: "Contaedje des mots"
-+*/
-+};
- SfxSlotInfo FN_IDX_MARK_TO_IDX
- {
- SlotName = "Indexmarke zum Index";
-Index: sw/sdi/viewsh.sdi
-===================================================================
-RCS file: /cvs/sw/sw/sdi/viewsh.sdi,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 viewsh.sdi
---- sw/sdi/viewsh.sdi 6 Dec 2002 13:58:48 -0000 1.9
-+++ sw/sdi/viewsh.sdi 31 Jul 2003 17:01:27 -0000
-@@ -112,6 +112,12 @@ interface TextEditView : BaseTextEditVie
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
-+ FN_WORD_COUNT_DLG // status(final|play)
-+ [
-+ ExecMethod = ExecLingu ;
-+ StateMethod = GetState ;
-+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-+ ];
- FN_CHANGE_PAGENUM // status(final)
- [
- ExecMethod = ExecDlg ;
-Index: sw/source/ui/inc/swmn.hrc
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/inc/swmn.hrc,v
-retrieving revision 1.133
-diff -u -p -u -r1.133 swmn.hrc
---- sw/source/ui/inc/swmn.hrc 17 Jul 2003 11:58:11 -0000 1.133
-+++ sw/source/ui/inc/swmn.hrc 31 Jul 2003 17:02:02 -0000
-@@ -7708,6 +7708,54 @@ MenuItem _MN_EXTRA
- Text[ hindi ] = "~à€čà€Ÿà€à€«à€šà„à€¶à€š...";
- Text[ slovak ] = "~Delenie slov...";
- };
-+ MenuItem
-+ {
-+ Identifier = FN_WORD_COUNT_DLG ;
-+ HelpID = FN_WORD_COUNT_DLG ;
-+ Text = "Wörter zÀhlen..." ;
-+ Text [ arabic ] = "Ă
ĂĂĂĂĂĂĂ...";
-+ Text [ english ] = "Word count...";
-+ Text [ english_us ] = "Word count...";
-+ Text [ catalan ] = "Comptador de paraules...";
-+ Text [ czech ] = "PoĂ?et slov...";
-+ Text [ danish ] = "OrdoptĂŠlling...";
-+ Text [ greek ] = "Ă?Ă?ĂÂŻĂžĂÂŒĂ·Ă?Ă· Ă?ĂÂĂŸĂ”Ă?ĂÂœ...";
-+ Text [ spanish ] = "Contar palabras...";
-+ Text [ estonian ] = "SÔnade arv...";
-+ Text [ finnish ] = "Laske sanat...";
-+ Text [ french ] = "Statistiques...";
-+ Text [ hindi ] = "à €¶à €à „?à €Š à €?à €¿à €šà „?à €?...";
-+ Text [ italian ] = "Statistiche...";
-+ Text [ hungarian ] = "Szavak szĂĄma...";
-+ Text [ japanese ] = "ĂŁ?ÂŻĂŁ?ÂŒĂŁ??ĂŁ?«ã?Šã?³ã??...";
-+ Text [ korean ] = "Ă?”ĂȘÂł?...";
-+ Text [ norwegian ] = "Ordtelling...";
-+ Text [ dutch ] = "Woorden tellen...";
-+ Text [ polish ] = "Liczba s³ów...";
-+ Text [ portuguese ] = "Contagem palavras...";
-+ Text [ portuguese_brazilian ] = "Contagem palavras...";
-+ Text [ russian ] = "Ă?ĂŸĂ»ĂžĂ?Ă”Ă?Ă?ĂÂČĂŸ Ă?Ă»ĂŸĂÂČ...";
-+ Text [ slovak ] = "PoĂ?et slov...";
-+ Text [ swedish ] = "OrdrÀkning...";
-+ Text [ turkish ] = "Ăstatistik...";
-+ Text [ chinese_simplified ] = "ç»?ڟ¥...";
-+ Text [ chinese_traditional ] = "由ښ?...";
-+/* --: "Word count" translations
-+ az: "K�lm� Miqdarñ"
-+ bs: "Zbir rijeĂ?i"
-+ cy: "Cyfrif geiriau"
-+ eu: "Hitz kopurua"
-+ mk: "Ă?Ă?ĂŸĂ”Ă?Ă” ĂÂœĂ° Ă·Ă±ĂŸĂ?ĂŸĂÂČĂž"
-+ mt: "Gçadd taù?? kliem"
-+ ro: "NumĂ?rĂ? cuvintele"
-+ sl: "Ă
tevilo besed"
-+ sq: "Llogariti fjalët"
-+ ta: "Ă Âź?Ă ÂŻ?Ă ÂźÂČĂ ÂŻ? Ă Âź?à Ÿ£à ¯?à Ÿ£à Ÿ¿"
-+ uk: "Ă?Ă?Ă»Ă?ĂÂșĂ?Ă?Ă?Ă? Ă?Ă»Ă?ĂÂČ"
-+ vi: "Ă?ĂĄÂșÂżm t廫"
-+ wa: "Contaedje des mots"
-+*/
-+ };
- #endif
- SEPARATOR ;
- MenuItem
-Index: sw/source/ui/uiview/viewling.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/uiview/viewling.cxx,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 viewling.cxx
---- sw/source/ui/uiview/viewling.cxx 17 Apr 2003 17:51:30 -0000 1.13
-+++ sw/source/ui/uiview/viewling.cxx 7 Aug 2003 12:38:22 -0000
-@@ -105,6 +105,9 @@
- #ifndef _SVX_DIALMGR_HXX //autogen
- #include <svx/dialmgr.hxx>
- #endif
-+#ifndef _SFX_DINFDLG_HXX
-+#include <sfx2/dinfdlg.hxx>
-+#endif
- #ifndef _SVX_LANGITEM_HXX
- #include <svx/langitem.hxx>
- #endif
-@@ -214,6 +217,40 @@ void SwView::ExecLingu(SfxRequest &rReq)
- case FN_HYPHENATE_OPT_DLG:
- HyphenateDocument();
- break;
-+ case FN_WORD_COUNT_DLG: {
-+
-+ SfxObjectShell *pObjectShell = GetObjectShell();
-+ if (!pObjectShell)
-+ break;
-+
-+ String aURL, aTitle;
-+ SfxDocumentInfo *pTmpDocInfo = new SfxDocumentInfo;
-+ *pTmpDocInfo = pObjectShell->GetDocInfo ();
-+ pTmpDocInfo->SetReadOnly( true );
-+ SfxDocumentInfoItem aDocInfoItem( aURL, *pTmpDocInfo );
-+
-+ SfxItemSet aSet(GetPool(), SID_DOCINFO, SID_DOCINFO,
-+ SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, 0L );
-+ aSet.Put( aDocInfoItem );
-+ aSet.Put( SfxStringItem( SID_EXPLORER_PROPS_START, aTitle ) );
-+
-+ // SwDocShell::CreateDocumentInfoDialog
-+ SfxDocumentInfoDialog *pDlg = pObjectShell->CreateDocumentInfoDialog( 0, aSet );
-+
-+ pDlg->RemoveResetButton();
-+ pDlg->RemoveTabPage( TP_DOCINFODESC );
-+ pDlg->RemoveTabPage( TP_DOCINFODOC );
-+ pDlg->RemoveTabPage( TP_DOCINFOUSER );
-+ pDlg->RemoveTabPage( TP_DOCINFORELOAD );
-+ pDlg->GetCancelButton().Hide();
-+
-+ pDlg->Execute(); // discard return value - it's irrelevant.
-+
-+ delete pDlg;
-+ delete pTmpDocInfo;
-+ break;
-+ }
-+
- default:
- ASSERT(!this, falscher Dispatcher);
- return;
+++ /dev/null
-#!/bin/sh
-# -----------------------------------------
-# OpenOffice wrapper script for OpenOffice.org
-# -----------------------------------------
-# (based on Mandrake & Red Hat & Debian)
-
-OOVERSION=@OOVERSION@
-OOVERSIONRC="$HOME/.sversionrc"
-
-if [ ! -z "$CONFIG_DIR" ]; then
- OOHOME="$HOME/$CONFIG_DIR/openoffice"
-else
- OOHOME="$HOME/.openoffice"
-fi
-
-# Remove any entry in .sversionrc if not already installed from RPM
-if [ -f "$OOVERSIONRC" ]; then
- oohome=$(cat $OOVERSIONRC | tr '\r' '\n' | grep "^OpenOffice.org ${OOVERSION}" | sed "s|^OpenOffice.org ${OOVERSION}=file://||")
- if [ -n "$oohome" -a "$oohome" != "$OOHOME" ]; then
- cp $OOVERSIONRC $OOVERSIONRC.orig
- perl -ni -e "m|file://${oohome}| or print" $OOVERSIONRC
- fi
-fi
-
-# Issue a workstation-type installation for the user, if necessary
-echo -n "Checking for existing user installation... "
-if [ -d "$OOHOME" ] && [ -e "$OOHOME/soffice" ] && [ -e "$OOHOME/spadmin" ] ; then
- echo "FOUND"
-else
- echo "NOT FOUND"
- echo -n "Performing first-time installation for user... "
- # rename old .sversonrc
- [ -f $HOME/.sversionrc ] && mv $HOME/.sversionrc $HOME/.sversionrc.old
- # run the automated setup
- lang=$(eval $(locale); echo "$LC_MESSAGES" | sed -n "s/\([a-z]*\)_.*/\1/p")
- /usr/lib/openoffice/program/setup -R:/etc/openoffice/autoresponse.conf -d:$OOHOME
- cat > $OOHOME/user/registry/data/org/openoffice/Setup.xcu << EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
- <node oor:name="Office">
- <prop oor:name="ooSetupInstallPath" oor:type="xs:string">
- <value>$OOHOME/user</value>
- </prop>
- </node>
- <node oor:name="L10N">
- <prop oor:name="ooLocale" oor:type="xs:string">
- <value>$lang</value>
- </prop>
- </node>
-</oor:component-data>
-EOF
- echo "DONE"
-fi
-
-echo "Starting OpenOffice.org..."
-LANG=$lang
-export LANG
-exec $OOHOME/soffice "$@"
+++ /dev/null
-#!/bin/sh
-if [ -z "$1" ]; then
- exec ooffice private:factory/s@APP@
-else
- exec ooffice "$@"
-fi
-EOF
+++ /dev/null
-diff -uNr xmlhelp.old/source/cxxhelp/qe/Query.cxx xmlhelp/source/cxxhelp/qe/Query.cxx
---- oo/xmlhelp.old/source/cxxhelp/qe/Query.cxx Sat Mar 29 21:42:56 2003
-+++ oo/xmlhelp/source/cxxhelp/qe/Query.cxx Sat Mar 29 22:00:57 2003
-@@ -153,7 +153,7 @@
- };
-
-
--#include <stl/algorithm>
-+#include <algorithm>
-
-
- QueryHit* HitStore::firstBestQueryHit()
+++ /dev/null
---- oo/xmloff/source/core/nmspmap.cxx.orig Fri May 23 20:15:24 2003
-+++ oo/xmloff/source/core/nmspmap.cxx Fri May 23 20:15:46 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -256,7 +256,7 @@
- sQName.append ( (*aIter).second->sPrefix);
- sQName.append ( sal_Unicode(':') );
- sQName.append ( rLocalName );
-- OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear();
-+ const OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear();
- const_cast < QNameCache * > (&aQNameCache)->operator[] ( QNamePair ( nKey, pString ) ) = rString;
- return rString;
- }
---- oo/xmloff/source/text/XMLChangeImportContext.cxx.orig Fri May 23 20:17:24 2003
-+++ oo/xmloff/source/text/XMLChangeImportContext.cxx Fri May 23 20:17:39 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -133,7 +133,7 @@
- // prepare parameters
- UniReference<XMLTextImportHelper> rHelper =
- GetImport().GetTextImport();
-- OUString& rID = xAttrList->getValueByIndex(nAttr);
-+ const OUString& rID = xAttrList->getValueByIndex(nAttr);
-
- // call for bStart and bEnd (may both be true)
- if (bIsStart)
-@@ -144,7 +144,8 @@
- // outside of paragraph and still open? set open redline ID
- if (bIsOutsideOfParagraph)
- {
-- rHelper->SetOpenRedlineId(rID);
-+ OUString crID = rID;
-+ rHelper->SetOpenRedlineId(crID);
- }
- }
- // else: ignore
---- oo/xmloff/source/text/XMLChangedRegionImportContext.cxx.orig Fri May 23 20:18:38 2003
-+++ oo/xmloff/source/text/XMLChangedRegionImportContext.cxx Fri May 23 20:18:52 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -137,7 +137,7 @@
- GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
- &sLocalName );
-
-- OUString& rValue = xAttrList->getValueByIndex(nAttr);
-+ const OUString& rValue = xAttrList->getValueByIndex(nAttr);
- if ( XML_NAMESPACE_TEXT == nPrefix )
- {
- if( IsXMLToken( sLocalName, XML_ID ) )
---- oo/xmloff/source/text/txtflde.cxx.orig Fri May 23 20:24:58 2003
-+++ oo/xmloff/source/text/txtflde.cxx Fri May 23 20:25:20 2003
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -1506,7 +1506,7 @@
- case FIELD_ID_DATABASE_DISPLAY:
- {
- // get database, table and column name from field master
-- Reference<XPropertySet> & xMaster = GetMasterPropertySet(rTextField);
-+ const Reference<XPropertySet> & xMaster = GetMasterPropertySet(rTextField);
- ProcessString(XML_DATABASE_NAME,
- GetStringProperty(sPropertyDataBaseName, xMaster));
- ProcessString(XML_TABLE_NAME,
+++ /dev/null
-#!/bin/sh
-# ------------------------------------------------------------------------
-# Red Hat replacement for org.openoffice.configuration.XMLDefaultGenerator
-# XSLT processor using xsltproc
-# ------------------------------------------------------------------------
-if [ "x$1" = x-Xmx128m ]; then
- shift
-else
- echo First argument not -Xmx128m
- exit 1
-fi
-if [ "x$1" = x-classpath ]; then
- shift
-else
- echo First argument not -classpath
- exit 1
-fi
-shift
-if [ "$1" != org.openoffice.configuration.XMLDefaultGenerator ]; then
- echo Only org.openoffice.configuration.XMLDefaultGenerator emulated
- exit 1
-fi
-shift
-xcd=$1
-xml="`dirname $1`/`basename $1 .xcd`.xml"
-if echo "$xcd" | grep -qv ^/; then
- xcd="`pwd`/$xcd"
-fi
-util=$2
-misc=$3
-data=$4
-dtd=`grep 'schema:component SYSTEM' $xcd | cut -d\" -f2`
-if echo "$dtd" | grep -qv ^/; then
- dtd="`dirname $xcd`/$dtd"
-fi
-if echo "$util" | grep -qv ^/; then
- util="`pwd`/$util"
-fi
-# Someone XML aware tell me how XML parser finds out it wants to load
-# instance{,2}.xsl from the .xcd and .dtd files
-if echo "$dtd" | grep -q description2; then
- xsl="$util/instance2.xsl"
-else
- xsl="$util/instance.xsl"
-fi
-xmli="$misc/instance/$xml"
-xmlt="$misc/template/$xml"
-mkdir -p `dirname $xmli`
-mkdir -p `dirname $xmlt`
-echo "** Start validating: file:$xcd"
-tmpd=`mktemp -d /tmp/ooxmlparse.XXXXXX` || exit 1
-gcc -xc - -o $tmpd/utf8filter <<"EOF"
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-
-int main (void)
-{
- char *buf = NULL, *p, *q, b[8];
- size_t bufsize = 0;
-
- while (getline (&buf, &bufsize, stdin) >= 0)
- {
- p = buf;
- while ((q = strstr (p, "&#x")) != NULL)
- {
- wchar_t w;
- int i;
-
- *q = '\0';
- fputs (p, stdout);
- w = strtoul (q + 3, &p, 16);
- if (*p++ != ';')
- abort ();
- if (w < 0x80)
- b[0] = w, b[1] = '\0';
- else if (w >= 0x7fffffff)
- abort ();
- else
- {
- for (i = 2; i < 6; i++)
- if ((w & (0xffffffff << (5 * i + 1))) == 0)
- break;
- b[0] = 0xffffff00 >> i;
- b[i--] = '\0';
- do
- {
- b[i] = 0x80 | (w & 0x3f); w >>= 6;
- }
- while (--i > 0);
- b[0] |= w;
- }
- fputs (b, stdout);
- }
- fputs (p, stdout);
- }
- exit (0);
-}
-EOF
-cp -a $dtd $tmpd/foo.dtd
-sed 's~^\(.*<xsl:attribute name="\)xml:lang\(".*\)$~&\
-\1cfg:xmllang\2~' $xsl > $tmpd/foo.xsl
-needs="`sed -n -e 's~^.*cfg:component="\([^"]*\)".*$~\1~p' $xcd | sort -u`"
-sedcmd=""
-for np in $needs; do
- n=`echo $np | sed -e 's~\.~/~g'`
- na=`basename $n`
- sed -e '/schema:component SYSTEM/s~^\([^"]*"\)[^"]*\(".*\)$~\1foo.dtd\2~' $n.xcd > $tmpd/$na.xcd
- ln -sf $na.xcd $tmpd/$na.xml
- sedcmd="$sedcmd;s@cfg:component=\"$np\"@cfg:component=\"$na\"@g"
-done
-sed -e '/schema:component SYSTEM/s~^\([^"]*"\)[^"]*\(".*\)$~\1foo.dtd\2~' -e "$sedcmd" $xcd > $tmpd/foo.xcd
-cat > $tmpd/postprocess.sed <<"EOF"
-s~xmlns:cfg="" ~~g
-s~xmlns:cfg\(="[^"]*"\)[ ]*\(cfg:package="[^"]*"\)~\2 xmlns:xcfg\1~
-s~[ ]*xmlns:cfg="[^"]>~~g
-s~xmlns:cfg="[^"]*"[ ]*~~g
-s~xmlns:xcfg~xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance" xmlns:cfg~
-s~^\(<?xml.*\)?>~\1 encoding="utf-8"?>~
-s~<\([a-zA-Z0-9_:]*\)\([ ][^>]*\)></\1>~<\1\2/>~g
-s~"~"~g
-s~[ ]name=~ cfg:name=~g
-s~[ ]type=~ cfg:type=~g
-s~xmllang=~xml:lang=~g
-s~xmlns:xsi=""[ ]*~~g
-s~\(<ooInetSuffix[^>]*\)[ ]cfg:null="true"~\1~g
-s~cfg:null=~xsi:null=~g
-EOF
-pushd $tmpd >/dev/null 2>&1
-xsltproc foo.xsl foo.xcd 2>/dev/null \
- | sed -f postprocess.sed | ./utf8filter > instance
-# For some reason cfg:instance-of from different component doesn't work for template
-# generation. Work around it.
-if grep -q 'schema:instance cfg:instance-of="Font" cfg:name="Font" cfg:component="Common"' foo.xcd; then
- sed -n '/schema:group[ ]*cfg:name="Font"/,/\/schema:group/p;/\/schema:templates/q' Common.xcd > Font.xcd
- sed '/<schema:templates>/r Font.xcd' foo.xcd > foo.xcd.new
- sed '/schema:instance cfg:instance-of="Font" cfg:name="Font"/s~[ ]*cfg:component="Common"~~' foo.xcd.new > foo.xcd
-fi
-xsltproc --stringparam templates true foo.xsl foo.xcd 2>/dev/null \
- | sed -f postprocess.sed | ./utf8filter > template
-if [ -f foo.xcd.new ]; then
- # Finish the workaround.
- awk '/<Font>/ { if (!a) { b=1; next; }
- sub(/<Font>/,"<Font xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\">"); }
- /<\/Font>/ { if (!a) { a=1; b=0; next; } }
- { if (b) next; print; }' template > template.new
- mv -f template.new template
-fi
-popd >/dev/null 2>&1
-cat $tmpd/instance > $xmli
-cat $tmpd/template > $xmlt
-rm -rf $tmpd
-echo "** Document is valid!"
-exit 0
+++ /dev/null
---- oo_1.0.1_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.old Thu Nov 30 19:03:34 2000
-+++ oo_1.0.1_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java Fri Nov 1 19:34:38 2002
-@@ -2,9 +2,9 @@
- *
- * $RCSfile$
- *
-- * $Revision$
-+ * $Revision$
- *
-- * last change: $Author$ $Date$
-+ * last change: $Author$ $Date$
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
-@@ -79,7 +79,7 @@
- Class.forName(className != null
- ? className
- : "sun.net.www.protocol." + protocol + ".Handler");
-- return (URLStreamHandler)handlerClass.newInstance();;
-+ return (URLStreamHandler)handlerClass.newInstance();
- }
- catch (Exception e) {
- System.err.println(e);
+++ /dev/null
---- filter/source/xsltfilter/makefile.mk.orig 2003-08-09 22:21:10.000000000 -0700
-+++ filter/source/xsltfilter/makefile.mk 2003-08-09 22:21:31.000000000 -0700
-@@ -90,7 +90,9 @@
- # + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/XSLTFilter$/META-INF
- # --- Targets ------------------------------------------------------
- .INCLUDE : target.mk
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVACLASSFILES) : $(CLASSDIR)
-+.ENDIF
-
- $(CLASSDIR) :
- $(MKDIR) $(CLASSDIR)
+++ /dev/null
---- filter/source/xsltvalidate/makefile.mk.orig 2003-08-09 22:07:10.000000000 -0700
-+++ filter/source/xsltvalidate/makefile.mk 2003-08-09 22:07:23.000000000 -0700
-@@ -87,7 +87,9 @@
- # + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/META-INF
- # --- Targets ------------------------------------------------------
- .INCLUDE : target.mk
-+.IF "$(SOLAR_JAVA)"!=""
- $(JAVACLASSFILES) : $(CLASSDIR)
-+.ENDIF
-
- $(CLASSDIR) :
- $(MKDIR) $(CLASSDIR)
+++ /dev/null
---- oo_641c_src/solenv/inc/_tg_zip.mk.zipdep Fri Nov 2 18:59:44 2001
-+++ oo_641c_src/solenv/inc/_tg_zip.mk Sat Feb 16 16:59:57 2002
-@@ -163,7 +163,8 @@
- +-zipdep $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
- .ENDIF # "$(ZIP2DIR)" != ""
- .ENDIF # "$(common_build_zip)"!=""
-- @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
-+# (gb) workaround for setup2/script/makefile.mk
-+# @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
- .ENDIF # "$(make_zip_deps)" != ""
- .ENDIF
-
---- oo_641c_src/tools/bootstrp/makefile.mk.zipdep Tue Oct 16 16:21:13 2001
-+++ oo_641c_src/tools/bootstrp/makefile.mk Fri Feb 15 17:02:24 2002
-@@ -147,7 +147,7 @@
- APP4LIBS= $(LB)$/bootstrp.lib
- APP4DEPN= $(LB)$/atools.lib $(LB)$/bootstrp.lib
-
--#APP5TARGET= zipdep
-+APP5TARGET= zipdep
- APP5OBJS= $(OBJ)$/zipdep.obj
- APP5LIBS= $(LB)$/bootstrp.lib
- APP5STDLIBS=$(STATIC_LIBS)
+++ /dev/null
-Index: sfx2/inc/sfxsids.hrc
-===================================================================
-RCS file: /cvs/framework/sfx2/inc/sfxsids.hrc,v
-retrieving revision 1.50
-diff -u -r1.50 sfxsids.hrc
---- sfx2/inc/sfxsids.hrc 16 May 2003 14:14:50 -0000 1.50
-+++ sfx2/inc/sfxsids.hrc 20 Aug 2003 21:41:32 -0000
-@@ -1141,6 +1141,7 @@
- #define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
-
- #define SID_ZOOM (SID_SVX_START + 289)
-+#define SID_ATTR_ZOOM (SID_SVX_START + 0)
- #define SID_ZOOM_TOOLBOX (SID_SVX_START + 96)
- #define SID_ZOOM_OUT (SID_SVX_START + 97)
- #define SID_ZOOM_IN (SID_SVX_START + 98)
-Index: sfx2/source/appl/app.src
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/app.src,v
-retrieving revision 1.88
-diff -u -r1.88 app.src
---- sfx2/source/appl/app.src 17 Jul 2003 13:14:26 -0000 1.88
-+++ sfx2/source/appl/app.src 20 Aug 2003 21:36:38 -0000
-@@ -3657,6 +3657,14 @@
- };
- ToolBoxItem
- {
-+ Identifier = SID_ATTR_ZOOM ;
-+ };
-+ ToolBoxItem
-+ {
-+ Type = TOOLBOXITEM_SEPARATOR ;
-+ };
-+ ToolBoxItem
-+ {
- Identifier = SID_CLOSEDOC;
- Hide = TRUE;
- };
-cvs server: Diffing svx
-cvs server: Diffing svx/inc
-Index: svx/inc/dialogs.hrc
-===================================================================
-RCS file: /cvs/graphics/svx/inc/dialogs.hrc,v
-retrieving revision 1.48
-diff -u -r1.48 dialogs.hrc
---- svx/inc/dialogs.hrc 17 Apr 2003 17:39:50 -0000 1.48
-+++ svx/inc/dialogs.hrc 17 Aug 2003 16:31:10 -0000
-@@ -248,6 +248,8 @@
-
- // fuer ToolboxControl-Style
- #define RID_SVXTBX_STYLE (RID_SVX_START + 120)
-+// for Zoom Toolbox Control
-+#define RID_SVXTBX_ZOOM (RID_SVX_START + 121)
-
- #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140)
- #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
-Index: svx/inc/helpid.hrc
-===================================================================
-RCS file: /cvs/graphics/svx/inc/helpid.hrc,v
-retrieving revision 1.38
-diff -u -r1.38 helpid.hrc
---- svx/inc/helpid.hrc 30 Apr 2003 08:23:57 -0000 1.38
-+++ svx/inc/helpid.hrc 17 Aug 2003 16:31:26 -0000
-@@ -526,6 +526,7 @@
- #define HID_HANGULDLG_BUTTON_CHANGEALL (HID_SVX_EXT0_START + 25)
- #define HID_SPLDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 26)
- #define HID_HANGULDLG_EDIT_NEWWORD (HID_SVX_EXT0_START + 27)
-+#define HID_ZOOM_COMBOBOX (HID_SVX_EXT0_START + 28)
-
-
- // -----------------------------------------------------------------------
-@@ -540,7 +541,7 @@
-
- // overrun check 2
-
--#define ACT_SVX_HID_END2 HID_OPTIONS_CTL
-+#define ACT_SVX_HID_END2 HID_ZOOM_COMBOBOX
-
- #if ACT_SVX_HID2_END > HID_SVX_EXT0_END
- #error resource overrun in #line, #file
-Index: svx/source/tbxctrls/makefile.mk
-===================================================================
-RCS file: /cvs/graphics/svx/source/tbxctrls/makefile.mk,v
-retrieving revision 1.4
-diff -u -r1.4 makefile.mk
---- svx/source/tbxctrls/makefile.mk 2 May 2001 12:17:05 -0000 1.4
-+++ svx/source/tbxctrls/makefile.mk 17 Aug 2003 16:31:32 -0000
-@@ -102,7 +102,8 @@
- $(SLO)$/tbxalign.obj \
- $(SLO)$/tbxdraw.obj \
- $(SLO)$/tbxdrctl.obj \
-- $(SLO)$/verttexttbxctrl.obj
-+ $(SLO)$/verttexttbxctrl.obj \
-+ $(SLO)$/zoomtbxctrl.obj
-
- SRCFILES = \
- colrctrl.src \
-Index: svx/source/tbxctrls/tbcontrl.src
-===================================================================
-RCS file: /cvs/graphics/svx/source/tbxctrls/tbcontrl.src,v
-retrieving revision 1.35
-diff -u -r1.35 tbcontrl.src
---- svx/source/tbxctrls/tbcontrl.src 17 Jul 2003 11:33:35 -0000 1.35
-+++ svx/source/tbxctrls/tbcontrl.src 17 Aug 2003 16:31:38 -0000
-@@ -263,6 +263,16 @@
- Border = TRUE ;
- Hide = TRUE ;
- };
-+ComboBox RID_SVXTBX_ZOOM
-+{
-+ HelpId = HID_ZOOM_COMBOBOX ;
-+ Size = MAP_APPFONT ( 30 , 86 ) ;
-+ DropDown = TRUE ;
-+ AutoHScroll = TRUE ;
-+ DDExtraWidth = TRUE ;
-+ Border = TRUE ;
-+ Hide = TRUE ;
-+};
- String RID_SVXSTR_EXTRAS_CHARBACKGROUND
- {
- Text = "Zeichenhintergrund" ;
-
---- /dev/null 2003-02-11 15:36:20.000000000 +0100
-+++ svx/inc/zoomtbxctrl.hxx 2003-08-17 18:25:11.000000000 +0200
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ * $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): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+#ifndef _SVX_ZOOMTBXCTRL_HXX
-+#define _SVX_ZOOMTBXCTRL_HXX
-+
-+#ifndef _SFXTBXCTRL_HXX
-+#include <sfx2/tbxctrl.hxx>
-+#endif
-+
-+class SvxZoomToolBoxControl : public SfxToolBoxControl
-+{
-+public:
-+ SFX_DECL_TOOLBOX_CONTROL();
-+
-+ SvxZoomToolBoxControl( USHORT nId, ToolBox& rTbx, SfxBindings& rBindings );
-+ ~SvxZoomToolBoxControl();
-+
-+ virtual void StateChanged( USHORT nSID,
-+ SfxItemState eState,
-+ const SfxPoolItem* pState );
-+
-+ virtual Window* CreateItemWindow( Window *pParent );
-+};
-+
-+#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 @@
-+/*************************************************************************
-+ *
-+ * $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): _______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
-+
-+#ifndef _SV_TOOLBOX_HXX
-+#include <vcl/toolbox.hxx>
-+#endif
-+#ifndef _SFXAPP_HXX
-+#include <sfx2/app.hxx>
-+#endif
-+#ifndef _SFXDISPATCH_HXX
-+#include <sfx2/dispatch.hxx>
-+#endif
-+#ifndef _SFXVIEWSH_HXX
-+#include <sfx2/viewsh.hxx>
-+#endif
-+#ifndef _SV_COMBOBOX_HXX
-+#include <vcl/combobox.hxx>
-+#endif
-+
-+#include "dialogs.hrc"
-+
-+#include "zoomtbxctrl.hxx"
-+#include "zoomitem.hxx"
-+#include "dialmgr.hxx"
-+
-+#define MINZOOM 20
-+#define MAXZOOM 600
-+
-+SFX_IMPL_TOOLBOX_CONTROL( SvxZoomToolBoxControl, SvxZoomItem);
-+
-+class SvxZoomBox_Impl : public ComboBox
-+{
-+ USHORT nSlotId;
-+ SfxBindings& rBindings;
-+ BOOL bRelease;
-+public:
-+ SvxZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBind );
-+ ~SvxZoomBox_Impl();
-+
-+protected:
-+ virtual void Select();
-+ virtual long Notify( NotifyEvent& rNEvt );
-+
-+ void ReleaseFocus();
-+
-+};
-+
-+SvxZoomBox_Impl::SvxZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBind ):
-+ ComboBox(pParent, SVX_RES(RID_SVXTBX_ZOOM)),
-+ nSlotId(nSlot),
-+ rBindings(rBind),
-+ bRelease(TRUE)
-+{
-+ EnableAutocomplete( FALSE );
-+ USHORT aZoomValues[] =
-+ { 25, 50, 75, 100, 150, 200 };
-+ for(USHORT i = 0; i < sizeof(aZoomValues)/sizeof(USHORT); i++)
-+ {
-+ String sEntry = String::CreateFromInt32(aZoomValues[i]);
-+ sEntry += '%';
-+ InsertEntry(sEntry);
-+ }
-+}
-+
-+SvxZoomBox_Impl::~SvxZoomBox_Impl()
-+{}
-+
-+void SvxZoomBox_Impl::Select()
-+{
-+ if ( !IsTravelSelect() )
-+ {
-+ String sEntry( GetText() );
-+ sEntry.EraseAllChars( '%' );
-+ USHORT nZoom = (USHORT)sEntry.ToInt32();
-+
-+ if( nZoom < MINZOOM )
-+ nZoom = MINZOOM;
-+ if( nZoom > MAXZOOM )
-+ nZoom = MAXZOOM;
-+
-+ 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 )
-+{
-+ long nHandled = 0;
-+
-+ if ( rNEvt.GetType() == EVENT_KEYINPUT )
-+ {
-+ USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
-+
-+ switch ( nCode )
-+ {
-+ case KEY_RETURN:
-+ case KEY_TAB:
-+ {
-+ if ( KEY_TAB == nCode )
-+ bRelease = FALSE;
-+ else
-+ nHandled = 1;
-+ Select();
-+ break;
-+ }
-+
-+ case KEY_ESCAPE:
-+ SetText( GetSavedValue() );
-+ ReleaseFocus();
-+ break;
-+ }
-+ }
-+ else if ( EVENT_LOSEFOCUS == rNEvt.GetType() )
-+ {
-+ Window* pFocusWin = Application::GetFocusWindow();
-+ if ( !HasFocus() && GetSubEdit() != pFocusWin )
-+ SetText( GetSavedValue() );
-+ }
-+
-+ return nHandled ? nHandled : ComboBox::Notify( rNEvt );
-+}
-+
-+void SvxZoomBox_Impl::ReleaseFocus()
-+{
-+ if ( !bRelease )
-+ {
-+ bRelease = TRUE;
-+ return;
-+ }
-+ SfxViewShell* pCurSh = SfxViewShell::Current();
-+
-+ if ( pCurSh )
-+ {
-+ Window* pShellWnd = pCurSh->GetWindow();
-+
-+ if ( pShellWnd )
-+ pShellWnd->GrabFocus();
-+ }
-+}
-+
-+SvxZoomToolBoxControl::SvxZoomToolBoxControl( USHORT nId,
-+ ToolBox& rTbx,
-+ SfxBindings& rBind ) :
-+ SfxToolBoxControl( nId, rTbx, rBind )
-+{
-+}
-+
-+SvxZoomToolBoxControl::~SvxZoomToolBoxControl()
-+{
-+}
-+
-+void SvxZoomToolBoxControl::StateChanged( USHORT nSID,
-+ SfxItemState eState,
-+ const SfxPoolItem* pState )
-+{
-+ USHORT nId = GetId();
-+ GetToolBox().EnableItem( nId, (GetItemState( pState ) != SFX_ITEM_DISABLED) );
-+ SvxZoomBox_Impl* pBox = (SvxZoomBox_Impl*)GetToolBox().GetItemWindow( GetId() );
-+
-+ if( SFX_ITEM_AVAILABLE <= eState )
-+ {
-+ String sZoom( String::CreateFromInt32( ((const SfxUInt16Item*)pState)->GetValue() ) );
-+ sZoom += '%';
-+ pBox->SetText( sZoom );
-+ pBox->SaveValue();
-+ }
-+}
-+
-+Window* SvxZoomToolBoxControl::CreateItemWindow( Window *pParent )
-+{
-+ 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);
-
-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
projects / packages / libreoffice.git / commitdiff