--- /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.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;
projects / packages / libreoffice.git / commitdiff