ooo-build r14011 - in branches/ooo-build-3-0: . patches/vba

[strba svn gnome org]

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

Log:
massage patch so that it applies with older patchutils

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/vba/enhanced-form-userform-controls.diff

Modified: branches/ooo-build-3-0/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- branches/ooo-build-3-0/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ branches/ooo-build-3-0/patches/vba/enhanced-form-userform-controls.diff	Mon Sep 22 16:59:11 2008
@@ -1666,7 +1666,7 @@
  // progessmeter
  //__________________________________________________________________________________________________
  Reference< xml::input::XElement > ProgressBarElement::startChildElement(
-@@ -1073,9 +1175,37 @@ void ImageControlElement::endElement()
+@@ -1003,9 +1105,37 @@ void ImageControlElement::endElement()
  	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
  							   OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ),
  							   _xAttributes );
@@ -1707,7 +1707,7 @@
      ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
                                 OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
                                 _xAttributes );
-@@ -1408,10 +1538,24 @@ void TitledBoxElement::endElement()
+@@ -1338,10 +1468,24 @@ void TitledBoxElement::endElement()
  		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
  		Reference< xml::input::XAttributes > xAttributes(
              xRadio->getAttributes() );
@@ -1733,7 +1733,7 @@
  		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
  		
  		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
-@@ -1463,7 +1607,7 @@ void TitledBoxElement::endElement()
+@@ -1393,7 +1537,7 @@ void TitledBoxElement::endElement()
  		}
  		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
  										 makeAny( nVal ) );