1 --- oo_1.0.1_src/setup2/jsnative/nunxos.cxx.so-ooo-coexist 2001-10-10 18:36:11.000000000 +0200
2 +++ oo_1.0.1_src/setup2/jsnative/nunxos.cxx 2002-08-22 21:54:44.000000000 +0200
3 @@ -168,7 +168,7 @@ void UnxOS::Terminate()
4 void UnxOS::GetSVersion( char* buf, int len )
6 strcpy( buf, getenv("HOME") );
7 - strcat( buf, "/.sversionrc" );
8 + strcat( buf, "/.OOoversionrc" );
12 --- oo_1.0.1_src/setup2/mow/source/loader/loader.c.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
13 +++ oo_1.0.1_src/setup2/mow/source/loader/loader.c 2002-08-22 22:01:16.000000000 +0200
14 @@ -152,7 +152,7 @@ typedef const char* (*FncFindArch)(const
16 #define PATCH_FILE "patch.inf"
17 #define INSTDBINF_FILE "instdb.ins"
18 -#define SVERSION_FILE ".sversionrc"
19 +#define SVERSION_FILE ".OOoversionrc"
21 BOOL m_bNoJunk = FALSE;
23 --- oo_1.0.1_src/setup2/script/linux/1.0.0/webinstdb.inf.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
24 +++ oo_1.0.1_src/setup2/script/linux/1.0.0/webinstdb.inf 2002-08-22 21:54:44.000000000 +0200
25 @@ -78,11 +78,11 @@ End
27 HelpText gid_Help_WrongSetup
29 - Text = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found).";
30 + Text = "The application is already installed on your system (a OOoversion.ini or an sofficerc file with a matching entry has been found).";
32 - Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
33 + Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
35 - 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).";
36 + 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).";
39 HelpText gid_Help_Migration
40 @@ -8431,7 +8431,7 @@ End
42 Profile gid_Profile_Sversion_Ini
43 ModuleID = gid_Module_Root;
44 - Name = ".sversionrc";
45 + Name = ".OOoversionrc";
46 Dir = PREDEFINED_CONFIGDIR;
49 @@ -12383,7 +12383,7 @@ ProfileItem gid_Profileitem_Bootstrap_Lo
50 ProfileID = gid_Profile_Bootstrap_Ini;
51 Section = "Bootstrap";
53 - Value = "$(SYSUSERCONFIG)/.sversionrc";
54 + Value = "$(SYSUSERCONFIG)/.OOoversionrc";
58 --- oo_1.0.1_src/setup2/script/linux/1.0.1/webinstdb.inf.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
59 +++ oo_1.0.1_src/setup2/script/linux/1.0.1/webinstdb.inf 2002-08-22 21:54:44.000000000 +0200
60 @@ -74,11 +74,11 @@ End
62 HelpText gid_Help_WrongSetup
64 - Text = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found).";
65 + Text = "The application is already installed on your system (a OOoversion.ini or an sofficerc file with a matching entry has been found).";
67 - Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
68 + Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
70 - 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).";
71 + 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).";
74 HelpText gid_Help_Migration
75 @@ -1986,7 +1986,7 @@ End
77 Profile gid_Profile_Sversion_Ini
78 ModuleID = gid_Module_Root;
79 - Name = ".sversionrc";
80 + Name = ".OOoversionrc";
81 Dir = PREDEFINED_CONFIGDIR;
84 @@ -12055,7 +12055,7 @@ ProfileItem gid_Profileitem_Bootstrap_Lo
85 ProfileID = gid_Profile_Bootstrap_Ini;
86 Section = "Bootstrap";
88 - Value = "$(SYSUSERCONFIG)/.sversionrc";
89 + Value = "$(SYSUSERCONFIG)/.OOoversionrc";
93 --- oo_1.0.1_src/setup2/script/linux/1.1.1/webinstdb.inf.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
94 +++ oo_1.0.1_src/setup2/script/linux/1.1.1/webinstdb.inf 2002-08-22 21:54:44.000000000 +0200
95 @@ -74,11 +74,11 @@ End
97 HelpText gid_Help_WrongSetup
98 ID = "PAGE_WRONGSETUP";
99 - Text = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found).";
100 + Text = "The application is already installed on your system (a Oooversion.ini or an sofficerc file with a matching entry has been found).";
102 - Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
103 + Text (49) = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden).";
105 - 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).";
106 + 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).";
109 HelpText gid_Help_Migration
110 @@ -2025,7 +2025,7 @@ End
112 Profile gid_Profile_Sversion_Ini
113 ModuleID = gid_Module_Root;
114 - Name = ".sversionrc";
115 + Name = ".OOoversionrc";
116 Dir = PREDEFINED_CONFIGDIR;
119 @@ -13854,7 +13854,7 @@ ProfileItem gid_Profileitem_Bootstrap_Lo
120 ProfileID = gid_Profile_Bootstrap_Ini;
121 Section = "Bootstrap";
123 - Value = "$(SYSUSERCONFIG)/.sversionrc";
124 + Value = "$(SYSUSERCONFIG)/.OOoversionrc";
128 --- oo_1.0.1_src/setup2/source/custom/jvmsetup/loader/jvmapp.cxx.so-ooo-coexist 2001-12-17 13:39:27.000000000 +0100
129 +++ oo_1.0.1_src/setup2/source/custom/jvmsetup/loader/jvmapp.cxx 2002-08-22 21:54:44.000000000 +0200
130 @@ -185,9 +185,9 @@ MySiCustomEnvironment::MySiCustomEnviron
132 SiDirEntry aVersionfile(oStrConfigDir);
134 - aVersionfile += UniString::CreateFromAscii(".sversionrc");
135 + aVersionfile += UniString::CreateFromAscii(".OOoversionrc");
137 - aVersionfile += UniString::CreateFromAscii("sversion.ini");
138 + aVersionfile += UniString::CreateFromAscii("OOoversion.ini");
141 Config aVCfg( aVersionfile.GetFullUni() );
142 --- oo_1.0.1_src/setup2/wrapper/install.sh.so-ooo-coexist 2002-06-07 16:02:05.000000000 +0200
143 +++ oo_1.0.1_src/setup2/wrapper/install.sh 2002-08-22 21:54:44.000000000 +0200
145 if test "$installtype" = INSTALL_NORMAL; then
147 # Remove previous .sversionrc to prevent problems with previous versions
148 -oo_versionrc="$HOME/.sversionrc"
149 +oo_versionrc="$HOME/.OOoversionrc"
150 #if [ -f "$oo_versionrc" ]; then
151 # rm -f $oo_versionrc
153 --- oo_1.0.1_src/scp/source/office/files.scp.so-ooo-coexist 2002-08-21 21:18:24.000000000 +0200
154 +++ oo_1.0.1_src/scp/source/office/files.scp 2002-08-22 21:54:44.000000000 +0200
155 @@ -1301,14 +1301,14 @@ End
157 File GID_FILE_USER_RDB
159 - Name = "user60.rdb";
160 + Name = "userOOo10.rdb";
161 Dir = PREDEFINED_CONFIGDIR;
162 Styles = (DELETE_ONLY);
165 File GID_FILE_PUNKT_USER_RDB
167 - Name = ".user60.rdb";
168 + Name = ".userOOo10.rdb";
169 Dir = PREDEFINED_CONFIGDIR;
170 Styles = (DELETE_ONLY);
172 --- oo_1.0.1_src/scp/source/office/profile.scp.so-ooo-coexist 2002-06-20 12:22:20.000000000 +0200
173 +++ oo_1.0.1_src/scp/source/office/profile.scp 2002-08-22 21:54:44.000000000 +0200
174 @@ -15,9 +15,9 @@ End
175 Profile GID_PROFILE_SVERSION_INI
176 ModuleID = GID_MODULE_ROOT;
178 - Name = ".sversionrc";
179 + Name = ".OOoversionrc";
181 - Name = "sversion.ini";
182 + Name = "OOoversion.ini";
184 Dir = PREDEFINED_CONFIGDIR;
186 @@ -121,9 +121,9 @@ End
190 - Value = "$SYSUSERCONFIG/sversion.ini";
191 + Value = "$SYSUSERCONFIG/OOoversion.ini";
193 - Value = "$SYSUSERCONFIG/.sversionrc";
194 + Value = "$SYSUSERCONFIG/.OOoversionrc";
198 @@ -276,9 +276,9 @@ ProfileItem GID_PROFILEITEM_SOFFICE_UNO_
200 Key = "UNO_WRITERDB";
202 - Value = "$SYSUSERCONFIG/user60.rdb";
203 + Value = "$SYSUSERCONFIG/userOOo10.rdb";
205 - Value = "$SYSUSERCONFIG/.user60.rdb";
206 + Value = "$SYSUSERCONFIG/.userOOo10.rdb";
210 --- oo_1.0.1_src/scp/source/office/setuphelp.lng.so-ooo-coexist 2002-08-21 21:18:25.000000000 +0200
211 +++ oo_1.0.1_src/scp/source/office/setuphelp.lng 2002-08-22 21:54:44.000000000 +0200
212 @@ -166,27 +166,27 @@
213 96 = "ãÑÍÈÇð Èß Ýí ÈÑäÇãÌ ÇáÊËÈíÊ \n\nááÍÕæá Úáì ÇáãÒíÏ ãä ÇáãÚáæãÇÊ¡ ÇáÑÌÇÁ ÇáÑÌæÚ Åáì Ïáíá ÇáÊËÈíÊ \n\nÝí ãÑÈÚÇÊ ÇáÍæÇÑ ÇáãÎÊáÝÉ áÈÑäÇãÌ ÇáÅÚÏÇÏ ÓæÝ ÊÌÏ ÇáãÒíÏ ãä ãÝÇÊíÍ ÇáãÓÇÚÏÉ. ÈäÞÑÉ æÇÍÏÉ ÝæÞ Ãí ãäåÇ íãßäß ÇáÍÕæá Úáì ãÓÇÚÏÉ ááÅÚÏÇÏÇÊ ÇáÎÇÕÉ ÈåÐÇ ÇáÌÒÁ ãä ÇáÊËÈíÊ."
215 [STR_HELP_WRONGSETUP]
216 -01 = "The application is already installed on your system (a sversion.ini or an sofficerc file with a matching entry has been found)."
217 -49 = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei sversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden)."
218 -07 = "Ýòî ïðèëîæåíèå óæå ñóùåñòâóåò â Âàøåé îïåðàöèîííîé ñèñòåìå (îáíàðóæåí ôàéë sversion.ini èëè sofficerc)."
219 -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."
220 -37 = "L'aplicació ja està instal·lada al sistema (s'ha trobat un fitxer sversion.ini o sofficerc amb una entrada que concideix)."
221 -03 = "A aplicação já se encontra instalada no seu sistema operativo (foi encontrado um ficheiro sversion.ini ou sofficerc com o respectivo registo)."
222 -30 = "Óôï óýóôçìÜ óáò õðÜñ÷åé Þäç ìéá Ýêäïóç ôçò åöáñìïãÞò (âñÝèçêå ôï áñ÷åßï sversion.ini Þ sofficerc ìå ôçí áíôßóôïé÷ç åããñáöÞ)."
223 -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)."
224 -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)."
225 -34 = "La aplicación ya está instalada en su sistema (se ha encontrado un archivo sversion.ini o sofficerc con la respectiva entrada)."
226 -35 = "Sovellus on jo asennettu järjestelmään (asennusohjelma löysi sversion.ini- tai sofficerc-tiedoston, jossa on asennettavaa ohjelmaa vastaavat merkinnät)."
227 -39 = "L'applicazione è già installata nel vostro sistema (è stato trovato un file sversion.ini o officerc contenete l'indicazione corrispondente)."
228 -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."
229 -46 = "Tillämpningen är redan installerad i ditt system (en sversion.ini-fil resp. sofficerc-fil med motsvarande post har hittats)."
230 -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)."
231 -81 = "お使いのシステムにはプログラムがすでにインストールされています。それらの項目を含む sversion.ini ファイル、あるいは sofficerc ファイルが見つかりました。"
232 -82 = "응용 프로그램이 이미 시스템에 설치되어 있습니다(해당 항목이 들어 있는 sversion.ini 또는 sofficerc 파일을 찾았음)"
233 -86 = "在您的系统中已经存在一个程序版本(因为找到一个sversion.ini 或者 sofficerc 文件条目)。"
234 -88 = "在系統內已經存在一個程式版本(在檔案 sversion.ini 或 sofficerc 內記錄相應的現存的版本的安裝路徑)。\n\n您能夠更新現有的版本。"
235 -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."
236 -96 = "åÐÇ ÇáÊØÈíÞ ãËÈÊ ÈÇáÝÚá Úáì äÙÇã ÇáÊÔÛíá ÇáÎÇÕ Èß (ÍíË Êã ÇáÚËæÑ Úáì ãáÝ sversion.ini Ãæ sofficerc Èå ÅÏÎÇá íËÈÊ Ðáß)."
237 +01 = "The application is already installed on your system (a OOoversion.ini or an sofficerc file with a matching entry has been found)."
238 +49 = "Die Anwendung ist in Ihrem System bereits installiert (eine Datei OOoversion.ini bzw. sofficerc mit entsprechendem Eintrag wurde gefunden)."
239 +07 = "Ýòî ïðèëîæåíèå óæå ñóùåñòâóåò â Âàøåé îïåðàöèîííîé ñèñòåìå (îáíàðóæåí ôàéë OOoversion.ini èëè sofficerc)."
240 +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."
241 +37 = "L'aplicació ja està instal·lada al sistema (s'ha trobat un fitxer OOoversion.ini o sofficerc amb una entrada que concideix)."
242 +03 = "A aplicação já se encontra instalada no seu sistema operativo (foi encontrado um ficheiro OOoversion.ini ou sofficerc com o respectivo registo)."
243 +30 = "Óôï óýóôçìÜ óáò õðÜñ÷åé Þäç ìéá Ýêäïóç ôçò åöáñìïãÞò (âñÝèçêå ôï áñ÷åßï OOoversion.ini Þ sofficerc ìå ôçí áíôßóôïé÷ç åããñáöÞ)."
244 +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)."
245 +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)."
246 +34 = "La aplicación ya está instalada en su sistema (se ha encontrado un archivo OOoversion.ini o sofficerc con la respectiva entrada)."
247 +35 = "Sovellus on jo asennettu järjestelmään (asennusohjelma löysi OOoversion.ini- tai sofficerc-tiedoston, jossa on asennettavaa ohjelmaa vastaavat merkinnät)."
248 +39 = "L'applicazione è già installata nel vostro sistema (è stato trovato un file OOoversion.ini o officerc contenete l'indicazione corrispondente)."
249 +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."
250 +46 = "Tillämpningen är redan installerad i ditt system (en OOoversion.ini-fil resp. sofficerc-fil med motsvarande post har hittats)."
251 +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)."
252 +81 = "お使いのシステムにはプログラムがすでにインストールされています。それらの項目を含む OOoversion.ini ファイル、あるいは sofficerc ファイルが見つかりました。"
253 +82 = "응용 프로그램이 이미 시스템에 설치되어 있습니다(해당 항목이 들어 있는 OOoversion.ini 또는 sofficerc 파일을 찾았음)"
254 +86 = "在您的系统中已经存在一个程序版本(因为找到一个OOoversion.ini 或者 sofficerc 文件条目)。"
255 +88 = "在系統內已經存在一個程式版本(在檔案 OOoversion.ini 或 sofficerc 內記錄相應的現存的版本的安裝路徑)。\n\n您能夠更新現有的版本。"
256 +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."
257 +96 = "åÐÇ ÇáÊØÈíÞ ãËÈÊ ÈÇáÝÚá Úáì äÙÇã ÇáÊÔÛíá ÇáÎÇÕ Èß (ÍíË Êã ÇáÚËæÑ Úáì ãáÝ OOoversion.ini Ãæ sofficerc Èå ÅÏÎÇá íËÈÊ Ðáß)."
260 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."
261 --- oo_1.0.1_src/scp/source/player/player.scp.so-ooo-coexist 2001-11-12 19:47:25.000000000 +0100
262 +++ oo_1.0.1_src/scp/source/player/player.scp 2002-08-22 21:54:44.000000000 +0200
263 @@ -751,9 +751,9 @@ ProfileItem GID_PROFILEITEM_BOOTSTRAP_LO
267 - Value = "$SYSUSERCONFIG/sversion.ini";
268 + Value = "$SYSUSERCONFIG/OOoversion.ini";
270 - Value = "$SYSUSERCONFIG/.sversionrc";
271 + Value = "$SYSUSERCONFIG/.OOoversionrc";
275 @@ -1537,9 +1537,9 @@ End
276 Profile GID_PROFILE_SVERSION
277 ModuleID = GID_MODULE_ROOT;
279 - Name = ".sversionrc";
280 + Name = ".OOoversionrc";
282 - Name = "sversion.ini";
283 + Name = "OOoversion.ini";
285 // Name = PROFILENAME(sversion);
286 Dir = PREDEFINED_CONFIGDIR;
287 --- oo_1.0.1_src/sal/osl/unx/profile.c.so-ooo-coexist 2001-11-21 15:29:50.000000000 +0100
288 +++ oo_1.0.1_src/sal/osl/unx/profile.c 2002-08-22 21:54:45.000000000 +0200
291 #define SVERSION_LOCATION STR_INI_METACFG
292 #define SVERSION_FALLBACK STR_INI_METASYS
293 -#define SVERSION_NAME "sversion"
294 +#define SVERSION_NAME "OOoversion"
295 #define SVERSION_SECTION "Versions"
296 #define SVERSION_SOFFICE "StarOffice"
297 #define SVERSION_PROFILE "sofficerc"
298 --- oo_1.0.1_src/tools/source/generic/config.cxx.so-ooo-coexist 2001-06-13 17:32:25.000000000 +0200
299 +++ oo_1.0.1_src/tools/source/generic/config.cxx 2002-08-22 21:54:45.000000000 +0200
300 @@ -239,9 +239,9 @@ static String ImplMakeConfigName( const
304 - aFileName = ::rtl::OUString::createFromAscii( ".sversionrc" );
305 + aFileName = ::rtl::OUString::createFromAscii( ".OOoversionrc" );
307 - aFileName = ::rtl::OUString::createFromAscii( "sversion.ini" );
308 + aFileName = ::rtl::OUString::createFromAscii( "OOoversion.ini" );
312 --- oo_1.0.1_src/unotools/inc/unotools/regpathhelper.hxx.so-ooo-coexist 2000-09-18 19:03:53.000000000 +0200
313 +++ oo_1.0.1_src/unotools/inc/unotools/regpathhelper.hxx 2002-08-22 21:54:45.000000000 +0200
314 @@ -73,7 +73,7 @@ namespace utl
315 * This function returns a path to the user registry file.
316 * Search for the user registry using the following rules:
318 - * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
319 + * <dt> 1. (for further use) search in OOoversion.ini (.OOoversionrc) for an entry
320 * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
321 * [Registry]. If found, then take this value instead of the name "user.rdb".
322 * <dt> 2. Search in the config directory of the user for a file "user.rdb". If
323 --- oo_1.0.1_src/comphelper/inc/comphelper/regpathhelper.hxx.so-ooo-coexist 2000-09-29 13:28:15.000000000 +0200
324 +++ oo_1.0.1_src/comphelper/inc/comphelper/regpathhelper.hxx 2002-08-22 21:54:45.000000000 +0200
325 @@ -73,7 +73,7 @@ namespace comphelper
326 * This function returns a path to the user registry file.
327 * Search for the user registry using the following rules:
329 - * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
330 + * <dt> 1. (for further use) search in OOoversion.ini (.OOoversionrc) for an entry
331 * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
332 * [Registry]. If found, then take this value instead of the name "user.rdb".
333 * <dt> 2. Search in the config directory of the user for a file "user.rdb". If
334 --- oo_1.0.1_src/comphelper/source/misc/regpathhelper.cxx.so-ooo-coexist 2001-07-23 12:14:42.000000000 +0200
335 +++ oo_1.0.1_src/comphelper/source/misc/regpathhelper.cxx 2002-08-22 21:54:45.000000000 +0200
336 @@ -93,7 +93,7 @@ using namespace rtl;
337 #define SYSTEM_REGISTRY_NAME_ENV "STAR_REGISTRY"
338 #define REGISTRY_SYSTEM_NAME "applicat.rdb"
340 -#define REGISTRY_LOCAL_NAME "user60.rdb"
341 +#define REGISTRY_LOCAL_NAME "userOOo10.rdb"
344 #define CONFIG_PATH_PREFIX "."
345 --- oo_1.0.1_src/udkapi/com/sun/star/registry/DefaultRegistry.idl.so-ooo-coexist 2001-11-16 16:05:59.000000000 +0100
346 +++ oo_1.0.1_src/udkapi/com/sun/star/registry/DefaultRegistry.idl 2002-08-22 21:54:45.000000000 +0200
351 - <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry
352 + <dt> 1. (for further use) search in OOoversion.ini (.OOoversionrc) for an entry
353 REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section
354 [Registry]. If found, then take this value instead of "user.rdb" as "REGISTRY NAME".
356 --- oo_1.0.1_src/padmin/source/adddlg.cxx.so-ooo-coexist 2001-12-19 16:36:55.000000000 +0100
357 +++ oo_1.0.1_src/padmin/source/adddlg.cxx 2002-08-22 21:54:45.000000000 +0200
358 @@ -1077,7 +1077,7 @@ String AddPrinterDialog::getOldPrinterLo
359 if( access( aFileName.GetBuffer(), F_OK ) )
362 - aFileName.Append( "/.sversionrc" );
363 + aFileName.Append( "/.OOoversionrc" );
364 Config aSVer( String( aFileName, aEncoding ) );
365 aSVer.SetGroup( "Versions" );
366 aFileName = aSVer.ReadKey( "StarOffice 5.2" );