ooo-build r12936 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Jun 20 18:11:54 2008
New Revision: 12936
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12936&view=rev

Log:
2008-06-20  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/speed-configmgr-misc-m19.diff,
          patches/dev300/speed-configmgr-misc.diff: dev300-m20


Added:
   trunk/patches/dev300/speed-configmgr-misc-m19.diff
      - copied unchanged from r12934, /trunk/patches/dev300/speed-configmgr-misc.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-configmgr-misc.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jun 20 18:11:54 2008
@@ -227,9 +227,14 @@
 # Make the historically very verbose build quieter, helps us see warnings.
 quiet-build.diff, i#84497, michael
 
+[ TemporaryHacks < dev300-m20 ]
+# further performance tweaks to configmgr
+speed-configmgr-misc-m19.diff, i#84751, michael
+[ TemporaryHacks >= dev300-m20 ]
 # further performance tweaks to configmgr
 speed-configmgr-misc.diff, i#84751, michael
 
+[ TemporaryHacks ]
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
@@ -471,9 +476,11 @@
 
 localize-pl-cygwin-paths.diff, tml
 
+[ Fixes < dev300-m20 ]
 # vba types are not available, causes all sort strangeness
 vba-3-layer-missingtypes.diff, i#88739, noelpwer
 
+[ Fixes ]
 # init a bool member in SbUnoObject's ctor initializer.
 basic-initialize-member.diff, i#88930, kohei
 
@@ -904,6 +911,7 @@
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek
 
+[ BuildBits < dev300-m20 ]
 # fix build with system-hunspell
 fix-system-hunspell.diff, i#87604
 

Modified: trunk/patches/dev300/speed-configmgr-misc.diff
==============================================================================
--- trunk/patches/dev300/speed-configmgr-misc.diff	(original)
+++ trunk/patches/dev300/speed-configmgr-misc.diff	Fri Jun 20 18:11:54 2008
@@ -23,17 +23,14 @@
 diff -u -p -u -r1.8 binaryreader.cxx
 --- configmgr/source/backend/binaryreader.cxx	3 Apr 2007 13:57:13 -0000	1.8
 +++ configmgr/source/backend/binaryreader.cxx	19 Dec 2007 11:41:54 -0000
-@@ -592,13 +592,13 @@ namespace configmgr
- 		}
+@@ -535,10 +535,10 @@
+ 
  		// --------------------------------------------------------------------------
  
 -        inline uno::Reference<io::XDataInputStream> BinaryReader::getDataInputStream()
 +        inline BinaryReader_Impl * BinaryReader::getDataInputStream()
  		{
              OSL_ENSURE(m_xDataInputStream.is(),"Binary Cache: Reader was not opened - no input stream");
- #if 0
-             if (!m_xDataInputStream.is()) throw io::NotConnectedException();
- #endif
 -            return m_xDataInputStream;
 +            return static_cast<BinaryReader_Impl *>(m_xDataInputStream.get());
  		}