[packages/libreoffice.git] / openoffice-setup-localized-instdb.patch

--- 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);
Commit	Line	Data
79257f23	1	--- oo_1.0.1_src/setup2/inc/main.hxx.setup-localized-instdb 2002-05-31 12:05:00.000000000 +0200
	2	+++ oo_1.0.1_src/setup2/inc/main.hxx 2002-09-03 14:19:40.000000000 +0200
	3	@@ -165,6 +165,7 @@ private:
	4	ByteString m_aParamDestPath;
	5	ByteString m_aParamFollowApp;
	6	ByteString m_SetupIniSourcePath;
	7	+ ByteString m_aInstDBLanguageSuffix;
	8	int m_nLanguage;
	9	USHORT m_nWorkStationCnt;
	10	USHORT m_nWorkStationIdx;
	11	--- oo_1.0.1_src/setup2/source/ui/main.cxx.setup-localized-instdb 2002-07-15 01:20:24.000000000 +0200
	12	+++ oo_1.0.1_src/setup2/source/ui/main.cxx 2002-09-03 15:12:15.000000000 +0200
	13	@@ -1294,6 +1294,13 @@ UniString SetupApp::ReadParams()
	14	}
	15	else
	16	//////////////////////////////////////
	17	+ // LANG:(instdb.ins language suffix)
	18	+ if( aParamPrefix == "LANG:" )
	19	+ {
	20	+ m_aInstDBLanguageSuffix = aParamPostfix;
	21	+ }
	22	+ else
	23	+ //////////////////////////////////////
	24	// SDUMP
	25	if( aParamName == "SDUMP" )
	26	{
	27	@@ -1401,6 +1408,12 @@ BOOL SetupApp::FindAndReadScript()
	28	BOOL bWorkstation = FALSE;
	29
	30	ByteString aScriptName( SETUP_INSTDB_FILE );
	31	+ if ( m_aInstDBLanguageSuffix.Len() )
	32	+ {
	33	+ aScriptName += ".";
	34	+ aScriptName += m_aInstDBLanguageSuffix;
	35	+ }
	36	+
	37	SiDirEntry aScript (m_pEnv->GetStartPath());
	38	aScript += aScriptName;
	39
	40	@@ -1410,6 +1423,20 @@ BOOL SetupApp::FindAndReadScript()
	41	aScript += aScriptName;
	42	}
	43
	44	+ // Fallback to default script
	45	+ if( !aScript.Exists() && m_aInstDBLanguageSuffix.Len() )
	46	+ {
	47	+ aScriptName.Assign( SETUP_INSTDB_FILE );
	48	+ aScript = SiDirEntry( m_pEnv->GetStartPath() );
	49	+ aScript += aScriptName;
	50	+
	51	+ while( (!aScript.Exists()) && (aScript.Level() > 2) )
	52	+ {
	53	+ aScript = aScript[2];
	54	+ aScript += aScriptName;
	55	+ }
	56	+ }
	57	+
	58	if( aScript.Exists() )
	59	{
	60	m_pEnv->SetFirstInstallation(FALSE);