ooo-build r14174 - trunk/patches/dev300

[michael svn gnome org]

Author: michael
Date: Wed Oct  1 14:41:07 2008
New Revision: 14174
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14174&view=rev

Log:
tested & works ...


Modified:
   trunk/patches/dev300/speed-build-transex.diff

Modified: trunk/patches/dev300/speed-build-transex.diff
==============================================================================
--- trunk/patches/dev300/speed-build-transex.diff	(original)
+++ trunk/patches/dev300/speed-build-transex.diff	Wed Oct  1 14:41:07 2008
@@ -1,6 +1,20 @@
-diff -u -w -r transex3/source/merge.cxx transex3/source/merge.cxx
+diff -u -w -r transex3/inc/export.hxx transex3/inc/export.hxx
+--- transex3/inc/export.hxx	2008-04-10 10:26:41.000000000 +0100
++++ transex3/inc/export.hxx	2008-10-01 14:33:31.000000000 +0100
+@@ -510,7 +510,9 @@
+ 	SvFileStream aErrLog;
+     ByteStringSet aLanguageSet;
+     MergeDataHashMap aMap;  
+-    std::vector<ByteString> aLanguages;
++    ByteStringHashMap aLanguageMap;
++    std::vector<ByteString> aLanguageList;
++    ByteStringHashMap aFilenames;
+     
+ 
+ public:
+
 --- transex3/source/merge.cxx	2008-04-10 10:42:45.000000000 +0100
-+++ transex3/source/merge.cxx	2008-10-01 14:49:17.000000000 +0100
++++ transex3/source/merge.cxx	2008-10-01 15:33:23.000000000 +0100
 @@ -210,6 +210,7 @@
  	ByteString sTEXT;
  	ByteString sQHTEXT;
@@ -42,19 +56,19 @@
 -			    sTITLE = sLine.GetToken( 13, '\t' );
 +			  xub_StrLen rIdx = 0;
 +			  sTYP = sLine.GetToken( 3, '\t', rIdx );
-+			  sGID = sLine.GetToken( 1, '\t', rIdx ); // 4
-+			  sLID = sLine.GetToken( 1, '\t', rIdx ); // 5
-+			  sPFO = sLine.GetToken( 2, '\t', rIdx ); // 7
++			  sGID = sLine.GetToken( 0, '\t', rIdx ); // 4
++			  sLID = sLine.GetToken( 0, '\t', rIdx ); // 5
++			  sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7
 +			  sPFO = sHACK;
-+			  nLANG = sLine.GetToken( 2, '\t', rIdx ); // 9
++			  nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9
++			  sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10
 +
-+			  sTEXT = sLine.GetToken( 1, '\t', rIdx ); // 10
-+			  sQHTEXT = sLine.GetToken( 2, '\t', rIdx ); // 12
-+			  sTITLE = sLine.GetToken( 1, '\t', rIdx );  // 13
++			  sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12
++			  sTITLE = sLine.GetToken( 0, '\t', rIdx );  // 13
  
                  nLANG.EraseLeadingAndTrailingChars();
  
-@@ -250,20 +250,22 @@
+@@ -250,20 +263,22 @@
  #else
                  if (  !nLANG.EqualsIgnoreCaseAscii("en-US")  ){
  #endif
@@ -87,7 +101,16 @@
  			printf("ERROR: File format is obsolete and no longer supported!\n");
          }
      }
-@@ -318,7 +320,7 @@
+@@ -286,7 +301,7 @@
+ 	ByteString sRet( "MergeDataFile\n" );
+ 
+   	//sRet.Append( Export::DumpMap( "aLanguageSet" , aLanguageSet ) );
+-	//sRet.Append( Export::DumpMap( "aLanguages" , aLanguages ) );
++	//sRet.Append( Export::DumpMap( "aLanguageList" , aLanguageList ) );
+ 	printf("MergeDataFile\n");
+ 	MergeDataHashMap::const_iterator idbg;
+ 	for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){
+@@ -318,7 +333,7 @@
  		fprintf( stderr, "%s\n", rLine.GetBuffer());
  }
  std::vector<ByteString> MergeDataFile::GetLanguages(){ 
@@ -96,7 +119,7 @@
  }
  
  /*****************************************************************************/
-@@ -379,23 +381,32 @@
+@@ -379,23 +394,32 @@
  					const ByteString &rLID, const ByteString &rPFO,
  					const ByteString &nLANG, const ByteString &rTEXT,
  					const ByteString &rQHTEXT, const ByteString &rTITLE ,
@@ -137,18 +160,3 @@
  	}
  
  	bFound = FALSE;
-
-diff -u -w -r transex3/inc/export.hxx transex3/inc/export.hxx
---- transex3/inc/export.hxx	2008-04-10 10:26:41.000000000 +0100
-+++ transex3/inc/export.hxx	2008-10-01 14:33:31.000000000 +0100
-@@ -510,7 +510,9 @@
- 	SvFileStream aErrLog;
-     ByteStringSet aLanguageSet;
-     MergeDataHashMap aMap;  
--    std::vector<ByteString> aLanguages;
-+    ByteStringHashMap aLanguageMap;
-+    std::vector<ByteString> aLanguageList;
-+    ByteStringHashMap aFilenames;
-     
- 
- public: