ooo-build r14003 - in trunk: . bin patches/dev300

[strba svn gnome org]

Author: strba
Date: Mon Sep 22 14:08:59 2008
New Revision: 14003
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14003&view=rev

Log:
massage a patch to apply with older patchutils + source ./setup to prevent some problems on CentOS4

Modified:
   trunk/ChangeLog
   trunk/bin/applyflags
   trunk/patches/dev300/controls-with-images-import.diff

Modified: trunk/bin/applyflags
==============================================================================
--- trunk/bin/applyflags	(original)
+++ trunk/bin/applyflags	Mon Sep 22 14:08:59 2008
@@ -11,7 +11,7 @@
 fi
 
 cd $bindir
-source setup >& /dev/null
+source ./setup >& /dev/null
 
 echo -n "--distro=$DISTRO";
 if test -d $OOBUILDDIR/binfilter; then

Modified: trunk/patches/dev300/controls-with-images-import.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-import.diff	(original)
+++ trunk/patches/dev300/controls-with-images-import.diff	Mon Sep 22 14:08:59 2008
@@ -98,7 +98,7 @@
  
 --- svx/source/msfilter/msocximex.cxx.bak	2008-09-01 10:18:35.000000000 +0800
 +++ svx/source/msfilter/msocximex.cxx	2008-09-01 10:54:52.000000000 +0800
-@@ -83,6 +83,12 @@
+@@ -79,6 +79,12 @@
  
  #include <algorithm>
  #include <memory>
@@ -109,9 +109,9 @@
 +#include <comphelper/componentcontext.hxx>
 +#include <unotools/streamwrap.hxx>
  
- #include <com/sun/star/beans/NamedValue.hpp>
- #include <com/sun/star/table/XCellRange.hpp>
-@@ -113,6 +119,7 @@ using namespace cppu;
+ #ifndef C2S
+ #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
+@@ -102,6 +108,7 @@ using namespace cppu;
  
  
  #define WW8_ASCII2STR(s) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(s))
@@ -119,7 +119,7 @@
  
  
  static char sWW8_form[] = "WW-Standard";
-@@ -141,126 +148,48 @@ long ReadAlign(SvStorageStream *pS, long
+@@ -130,126 +137,48 @@ long ReadAlign(SvStorageStream *pS, long
      return 0;
  }
  
@@ -280,7 +280,7 @@
  
  long WriteAlign(SvStorageStream *pS, int nAmount)
  {
-@@ -1397,6 +1326,12 @@ sal_Bool OCX_CommandButton::Import( com:
+@@ -1243,6 +1172,12 @@ sal_Bool OCX_CommandButton::Import( com:
      rPropSet->setPropertyValue( WW8_ASCII2STR( "FocusOnClick" ), aTmp );
  
  	aFontData.Import(rPropSet);
@@ -293,9 +293,9 @@
  	return sal_True;
  }
  
-@@ -1780,6 +1715,12 @@ sal_Bool OCX_OptionButton::Import(com::s
- 	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
- 	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
+@@ -1564,6 +1599,12 @@ sal_Bool OCX_OptionButton::Import(com::s
+     }
+ 
  	aFontData.Import(rPropSet);
 +
 +    if ( sImageUrl.getLength() )
@@ -306,7 +306,7 @@
  	return sal_True;
  }
  
-@@ -2414,6 +2355,12 @@ sal_Bool OCX_ToggleButton::Import(com::s
+@@ -2198,6 +2139,12 @@ sal_Bool OCX_ToggleButton::Import(com::s
  	}
  
  	aFontData.Import(rPropSet);
@@ -319,7 +319,7 @@
  	return sal_True;
  }
  
-@@ -3271,8 +3218,15 @@ sal_Bool OCX_ModernControl::Read(SvStora
+@@ -3051,8 +2998,15 @@ sal_Bool OCX_ModernControl::Read(SvStora
  	{
  		pS->Read(pPictureHeader,20);
  		*pS >> nPictureLen;
@@ -403,7 +403,7 @@
      return sal_True;
  }
  
-@@ -5276,12 +5256,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotS
+@@ -5016,12 +4996,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotS
  
  sal_Bool OCX_Image::Read(SotStorageStream *pS)
  {
@@ -416,7 +416,7 @@
      ULONG nStart = pS->Tell();
  	*pS >> nIdentifier;
  	DBG_ASSERT(nStandardId==nIdentifier,
-@@ -5372,16 +5346,14 @@ sal_Bool OCX_Image::Read(SotStorageStrea
+@@ -5125,16 +5099,14 @@ sal_Bool OCX_Image::Read(SotStorageStrea
  
          long imagePos = pS->Tell();