rpms/openoffice.org/devel ooobuild.VBAObjects.patch, 1.14, 1.15 openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch, 1.3, 1.4 openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.2, 1.3 openoffice.org.spec, 1.1176, 1.1177 openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch, 1.2, NONE workspace.cmcfixes32.patch, 1.2, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Sat May 19 10:38:13 UTC 2007 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29135

Modified Files:
	ooobuild.VBAObjects.patch 
	openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch 
	openoffice.org-1.9.97.rh156067.noversionedicons.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch 
	workspace.cmcfixes32.patch 
Log Message:
2.2.1 release candidate

ooobuild.VBAObjects.patch:

Index: ooobuild.VBAObjects.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ooobuild.VBAObjects.patch	30 Jan 2007 15:03:14 -0000	1.14
+++ ooobuild.VBAObjects.patch	19 May 2007 10:37:37 -0000	1.15
@@ -923,14 +923,6 @@
  	const rtl::OUString							msEventType;
  	const rtl::OUString							msPresentation;
  	const rtl::OUString							msMacroName;
-@@ -255,6 +259,7 @@
- 	SAL_DLLPRIVATE sal_Bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const rtl::OUString& rClass );
- 	SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
- 	SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
-+        SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::beans::PropertyValue* pProps, const sal_Int32 nCount );
- 	SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101#
- 	SAL_DLLPRIVATE void ImpExportGluePoints( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape );
- 
 diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/eventimp.cxx xmloff/source/draw/eventimp.cxx
 --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/eventimp.cxx	2005-09-09 14:44:06.000000000 +0100
 +++ xmloff/source/draw/eventimp.cxx	2006-06-19 12:19:16.000000000 +0100
@@ -1458,523 +1450,6 @@
  	} while(0);
  }
  
-diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport2.cxx xmloff/source/draw/shapeexport2.cxx
---- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport2.cxx	2006-04-26 15:10:26.000000000 +0100
-+++ xmloff/source/draw/shapeexport2.cxx	2006-06-19 12:19:23.000000000 +0100
-@@ -352,273 +352,302 @@ void XMLShapeExport::ImpExportText( cons
- #define FOUND_EVENTTYPE		0x0080
- #define FOUND_MACRO			0x0100
- #define FOUND_LIBRARY		0x0200
-+#define FOUND_ACTION		0x0400
- 
--void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& xShape )
-+void XMLShapeExport::ImpExportEvents( const beans::PropertyValue* pProperties, const sal_Int32 nCount )
- {
--	do
-+	sal_Int32 nFound = 0;
-+	OUString aStrEventType;
-+	presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
-+	presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE;
-+	presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW;
-+	OUString aStrSoundURL;
-+	sal_Bool bPlayFull = false;
-+	sal_Int32 nVerb = 0;
-+	OUString aStrMacro;
-+	OUString aStrLibrary;
-+	OUString aStrBookmark;
-+	OUString aHyperURL;
-+	sal_Int32 nIndex;
-+	for( nIndex = 0; nIndex < nCount; nIndex++, pProperties++ )
- 	{
--		uno::Reference< document::XEventsSupplier > xEventsSupplier( xShape, uno::UNO_QUERY );
--		if( !xEventsSupplier.is() )
--			break;
-+		if( ( ( nFound & FOUND_EVENTTYPE ) == 0 ) && pProperties->Name == msEventType )
-+		{
-+			if( pProperties->Value >>= aStrEventType )
-+				nFound |= FOUND_EVENTTYPE;
-+		}
-+		else if( ( ( nFound & FOUND_CLICKACTION ) == 0 ) && pProperties->Name == msClickAction )
-+		{
-+			if( pProperties->Value >>= eClickAction )
-+				nFound |= FOUND_CLICKACTION;
-+		}
-+		else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperties->Name == msMacroName || pProperties->Name == msScript ) )
-+		{
-+			if( pProperties->Value >>= aStrMacro )
-+				nFound |= FOUND_MACRO;
-+		}
-+		else if( ( ( nFound & FOUND_ACTION ) == 0 ) && ( pProperties->Name == msURL  ) )
-+		{
-+			if( pProperties->Value >>= aHyperURL )
-+				nFound |= FOUND_ACTION;
-+		}
-+		else if( ( ( nFound & FOUND_LIBRARY ) == 0 ) && pProperties->Name == msLibrary )
-+		{
-+			if( pProperties->Value >>= aStrLibrary )
-+				nFound |= FOUND_LIBRARY;
-+		}
-+		else if( ( ( nFound & FOUND_EFFECT ) == 0 ) && pProperties->Name == msEffect )
-+		{
-+			if( pProperties->Value >>= eEffect )
-+				nFound |= FOUND_EFFECT;
-+		}
-+		else if( ( ( nFound & FOUND_BOOKMARK ) == 0 ) && pProperties->Name == msBookmark )
-+		{
-+			if( pProperties->Value >>= aStrBookmark )
-+				nFound |= FOUND_BOOKMARK;
-+		}
-+		else if( ( ( nFound & FOUND_SPEED ) == 0 ) && pProperties->Name == msSpeed )
-+		{
-+			if( pProperties->Value >>= eSpeed )
-+				nFound |= FOUND_SPEED;
-+		}
-+		else if( ( ( nFound & FOUND_SOUNDURL ) == 0 ) && pProperties->Name == msSoundURL )
-+		{
-+			if( pProperties->Value >>= aStrSoundURL )
-+				nFound |= FOUND_SOUNDURL;
-+		}
-+		else if( ( ( nFound & FOUND_PLAYFULL ) == 0 ) && pProperties->Name == msPlayFull )
-+		{
-+			if( pProperties->Value >>= bPlayFull )
-+				nFound |= FOUND_PLAYFULL;
-+		}
-+		else if( ( ( nFound & FOUND_VERB ) == 0 ) && pProperties->Name == msVerb )
-+		{
-+			if( pProperties->Value >>= nVerb )
-+				nFound |= FOUND_VERB;
-+		}
-+	}
- 
--		uno::Reference< container::XNameReplace > xEvents( xEventsSupplier->getEvents() );
--		DBG_ASSERT( xEvents.is(), "XEventsSupplier::getEvents() returned NULL" );
--		if( !xEvents.is() )
--			break;
-+	if( ( nFound & FOUND_EVENTTYPE ) == 0 )
-+		return;
- 
--		uno::Sequence< beans::PropertyValue > aProperties;
--		if( !xEvents->hasByName( msOnClick ) )
--			break;
-+	if( aStrEventType == msPresentation )
-+	{
-+		if( ( nFound & FOUND_CLICKACTION ) == 0 )
-+			return;
- 
--		if( !(xEvents->getByName( msOnClick ) >>= aProperties) )
--			break;
-+		if( eClickAction == presentation::ClickAction_NONE )
-+			return;
- 
--		sal_Int32 nFound = 0;
--		const beans::PropertyValue* pProperties = aProperties.getConstArray();
-+		SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
- 
--		OUString aStrEventType;
--		presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
--		presentation::AnimationEffect eEffect =
--            presentation::AnimationEffect_NONE;
--		presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW;
--		OUString aStrSoundURL;
--		sal_Bool bPlayFull = false;
--		sal_Int32 nVerb = 0;
--		OUString aStrMacro;
--		OUString aStrLibrary;
--		OUString aStrBookmark;
-+		enum XMLTokenEnum eStrAction;
- 
--		const sal_Int32 nCount = aProperties.getLength();
--		sal_Int32 nIndex;
--		for( nIndex = 0; nIndex < nCount; nIndex++, pProperties++ )
-+		switch( eClickAction )
- 		{
--			if( ( ( nFound & FOUND_EVENTTYPE ) == 0 ) && pProperties->Name == msEventType )
--			{
--				if( pProperties->Value >>= aStrEventType )
--					nFound |= FOUND_EVENTTYPE;
--			}
--			else if( ( ( nFound & FOUND_CLICKACTION ) == 0 ) && pProperties->Name == msClickAction )
--			{
--				if( pProperties->Value >>= eClickAction )
--					nFound |= FOUND_CLICKACTION;
--			}
--			else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperties->Name == msMacroName || pProperties->Name == msScript ) )
--			{
--				if( pProperties->Value >>= aStrMacro )
--					nFound |= FOUND_MACRO;
--			}
--			else if( ( ( nFound & FOUND_LIBRARY ) == 0 ) && pProperties->Name == msLibrary )
--			{
--				if( pProperties->Value >>= aStrLibrary )
--					nFound |= FOUND_LIBRARY;
--			}
--			else if( ( ( nFound & FOUND_EFFECT ) == 0 ) && pProperties->Name == msEffect )
--			{
--				if( pProperties->Value >>= eEffect )
--					nFound |= FOUND_EFFECT;
--			}
--			else if( ( ( nFound & FOUND_BOOKMARK ) == 0 ) && pProperties->Name == msBookmark )
--			{
--				if( pProperties->Value >>= aStrBookmark )
--					nFound |= FOUND_BOOKMARK;
--			}
--			else if( ( ( nFound & FOUND_SPEED ) == 0 ) && pProperties->Name == msSpeed )
--			{
--				if( pProperties->Value >>= eSpeed )
--					nFound |= FOUND_SPEED;
--			}
--			else if( ( ( nFound & FOUND_SOUNDURL ) == 0 ) && pProperties->Name == msSoundURL )
--			{
--				if( pProperties->Value >>= aStrSoundURL )
--					nFound |= FOUND_SOUNDURL;
--			}
--			else if( ( ( nFound & FOUND_PLAYFULL ) == 0 ) && pProperties->Name == msPlayFull )
--			{
--				if( pProperties->Value >>= bPlayFull )
--					nFound |= FOUND_PLAYFULL;
--			}
--			else if( ( ( nFound & FOUND_VERB ) == 0 ) && pProperties->Name == msVerb )
--			{
--				if( pProperties->Value >>= nVerb )
--					nFound |= FOUND_VERB;
--			}
-+		case presentation::ClickAction_PREVPAGE:		eStrAction = XML_PREVIOUS_PAGE; break;
-+		case presentation::ClickAction_NEXTPAGE:		eStrAction = XML_NEXT_PAGE; break;
-+		case presentation::ClickAction_FIRSTPAGE:		eStrAction = XML_FIRST_PAGE; break;
-+		case presentation::ClickAction_LASTPAGE:		eStrAction = XML_LAST_PAGE; break;
-+		case presentation::ClickAction_INVISIBLE:		eStrAction = XML_HIDE; break;
-+		case presentation::ClickAction_STOPPRESENTATION:eStrAction = XML_STOP; break;
-+		case presentation::ClickAction_PROGRAM:			eStrAction = XML_EXECUTE; break;
-+		case presentation::ClickAction_BOOKMARK:		eStrAction = XML_SHOW; break;
-+		case presentation::ClickAction_DOCUMENT:		eStrAction = XML_SHOW; break;
-+		case presentation::ClickAction_MACRO:			eStrAction = XML_EXECUTE_MACRO; break;
-+		case presentation::ClickAction_VERB:			eStrAction = XML_VERB; break;
-+		case presentation::ClickAction_VANISH:			eStrAction = XML_FADE_OUT; break;
-+		case presentation::ClickAction_SOUND:			eStrAction = XML_SOUND; break;
-+		default:
-+			DBG_ERROR( "unknown presentation::ClickAction found!" );
-+			eStrAction = XML_UNKNOWN;
- 		}
- 
--		if( ( nFound & FOUND_EVENTTYPE ) == 0 )
--			break;
-+		OUString aEventQName(
-+			mrExport.GetNamespaceMap().GetQNameByKey(
-+					XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+		mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
-+		mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
- 
--		if( aStrEventType == msPresentation )
-+		if( eClickAction == presentation::ClickAction_VANISH )
- 		{
--			if( ( nFound & FOUND_CLICKACTION ) == 0 )
--				break;
-+			if( nFound & FOUND_EFFECT )
-+			{
-+				XMLEffect eKind;
-+				XMLEffectDirection eDirection;
-+				sal_Int16 nStartScale;
-+				sal_Bool bIn;
- 
--			if( eClickAction == presentation::ClickAction_NONE )
--				break;
-+				SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
- 
--			SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-+				if( eKind != EK_none )
-+				{
-+					SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap );
-+					mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() );
-+				}
- 
--			enum XMLTokenEnum eStrAction;
-+				if( eDirection != ED_none )
-+				{
-+					SvXMLUnitConverter::convertEnum( msBuffer, eDirection, aXML_AnimationDirection_EnumMap );
-+					mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, msBuffer.makeStringAndClear() );
-+				}
- 
--			switch( eClickAction )
--			{
--			case presentation::ClickAction_PREVPAGE:		eStrAction = XML_PREVIOUS_PAGE; break;
--			case presentation::ClickAction_NEXTPAGE:		eStrAction = XML_NEXT_PAGE; break;
--			case presentation::ClickAction_FIRSTPAGE:		eStrAction = XML_FIRST_PAGE; break;
--			case presentation::ClickAction_LASTPAGE:		eStrAction = XML_LAST_PAGE; break;
--			case presentation::ClickAction_INVISIBLE:		eStrAction = XML_HIDE; break;
--			case presentation::ClickAction_STOPPRESENTATION:eStrAction = XML_STOP; break;
--			case presentation::ClickAction_PROGRAM:			eStrAction = XML_EXECUTE; break;
--			case presentation::ClickAction_BOOKMARK:		eStrAction = XML_SHOW; break;
--			case presentation::ClickAction_DOCUMENT:		eStrAction = XML_SHOW; break;
--			case presentation::ClickAction_MACRO:			eStrAction = XML_EXECUTE_MACRO; break;
--			case presentation::ClickAction_VERB:			eStrAction = XML_VERB; break;
--			case presentation::ClickAction_VANISH:			eStrAction = XML_FADE_OUT; break;
--			case presentation::ClickAction_SOUND:			eStrAction = XML_SOUND; break;
--			default:
--				DBG_ERROR( "unknown presentation::ClickAction found!" );
--				eStrAction = XML_UNKNOWN;
-+				if( nStartScale != -1 )
-+				{
-+					SvXMLUnitConverter::convertPercent( msBuffer, nStartScale );
-+					mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, msBuffer.makeStringAndClear() );
-+				}
- 			}
- 
--			OUString aEventQName(
--				mrExport.GetNamespaceMap().GetQNameByKey(
--						XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
--			mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
--			mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
--
--			if( eClickAction == presentation::ClickAction_VANISH )
-+			if( nFound & FOUND_SPEED && eEffect != presentation::AnimationEffect_NONE )
- 			{
--				if( nFound & FOUND_EFFECT )
-+				if( eSpeed != presentation::AnimationSpeed_MEDIUM )
- 				{
--					XMLEffect eKind;
--					XMLEffectDirection eDirection;
--					sal_Int16 nStartScale;
--					sal_Bool bIn;
--
--					SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
-+					SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap );
-+					mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() );
-+				}
-+			}
-+		}
- 
--					if( eKind != EK_none )
--					{
--						SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap );
--						mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() );
--					}
-+		if( eClickAction == presentation::ClickAction_PROGRAM ||
-+			eClickAction == presentation::ClickAction_BOOKMARK ||
-+			eClickAction == presentation::ClickAction_DOCUMENT )
-+		{
-+			if( eClickAction == presentation::ClickAction_BOOKMARK )
-+				msBuffer.append( sal_Unicode('#') );
- 
--					if( eDirection != ED_none )
--					{
--						SvXMLUnitConverter::convertEnum( msBuffer, eDirection, aXML_AnimationDirection_EnumMap );
--						mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, msBuffer.makeStringAndClear() );
--					}
-+			msBuffer.append( aStrBookmark );
-+			mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) );
-+			mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-+			mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
-+			mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
-+		}
- 
--					if( nStartScale != -1 )
--					{
--						SvXMLUnitConverter::convertPercent( msBuffer, nStartScale );
--						mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, msBuffer.makeStringAndClear() );
--					}
--				}
-+		if( ( nFound & FOUND_VERB ) && eClickAction == presentation::ClickAction_VERB )
-+		{
-+			msBuffer.append( nVerb );
-+			mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear());
-+		}
- 
--				if( nFound & FOUND_SPEED && eEffect != presentation::AnimationEffect_NONE )
--				{
--					if( eSpeed != presentation::AnimationSpeed_MEDIUM )
--					{
--						SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap );
--						mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() );
--					}
--				}
--			}
-+		SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
- 
--			if( eClickAction == presentation::ClickAction_PROGRAM ||
--				eClickAction == presentation::ClickAction_BOOKMARK ||
--				eClickAction == presentation::ClickAction_DOCUMENT )
-+		if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND )
-+		{
-+			if( ( nFound & FOUND_SOUNDURL ) && aStrSoundURL.getLength() != 0 )
- 			{
--				if( eClickAction == presentation::ClickAction_BOOKMARK )
--					msBuffer.append( sal_Unicode('#') );
--
--				msBuffer.append( aStrBookmark );
--				mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) );
-+				mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStrSoundURL) );
- 				mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- 				mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
- 				mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
--			}
-+				if( nFound & FOUND_PLAYFULL && bPlayFull )
-+					mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
- 
--			if( ( nFound & FOUND_VERB ) && eClickAction == presentation::ClickAction_VERB )
--			{
--				msBuffer.append( nVerb );
--				mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear());
-+				SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
- 			}
-+		}
-+	}
-+	else if( aStrEventType == msStarBasic )
-+	{
-+		if( nFound & FOUND_MACRO )
-+		{
-+			SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
- 
--			SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
-+			mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, 
-+						mrExport.GetNamespaceMap().GetQNameByKey(
-+						 	XML_NAMESPACE_OOO, 
-+						 	OUString( RTL_CONSTASCII_USTRINGPARAM( 
-+											"starbasic" ) ) ) );
-+			OUString aEventQName(
-+				mrExport.GetNamespaceMap().GetQNameByKey(
-+						XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+			mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
- 
--			if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND )
-+			if( nFound & FOUND_LIBRARY )
- 			{
--				if( ( nFound & FOUND_SOUNDURL ) && aStrSoundURL.getLength() != 0 )
--				{
--					mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStrSoundURL) );
--					mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
--					mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
--					mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
--					if( nFound & FOUND_PLAYFULL && bPlayFull )
--						mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
--
--					SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
--				}
-+				OUString sLocation( GetXMLToken(
-+					(aStrLibrary.equalsIgnoreAsciiCaseAscii("StarOffice") ||
-+				 	 aStrLibrary.equalsIgnoreAsciiCaseAscii("application") ) ? XML_APPLICATION
-+														   			   : XML_DOCUMENT ) );
-+				OUStringBuffer sTmp( sLocation.getLength() + aStrMacro.getLength() + 1 );
-+				sTmp = sLocation;
-+				sTmp.append( sal_Unicode( ':' ) );
-+				sTmp.append( aStrMacro );
-+				mrExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,
-+									 sTmp.makeStringAndClear());
- 			}
--			break;
-+			else
-+			{
-+				mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro );
-+			}
-+
-+
-+			SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
- 		}
--		else if( aStrEventType == msStarBasic )
-+	}
-+	else if( aStrEventType == msScript || aStrEventType == msAction )
-+	{
-+		if( nFound & ( FOUND_MACRO | FOUND_ACTION ) )
- 		{
--			if( nFound & FOUND_MACRO )
-+			SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
-+			if ( nFound & FOUND_MACRO )
- 			{
--				SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
--
--				mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, 
--							mrExport.GetNamespaceMap().GetQNameByKey(
--							 	XML_NAMESPACE_OOO, 
--							 	OUString( RTL_CONSTASCII_USTRINGPARAM( 
--												"starbasic" ) ) ) );
-+				mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey(
-+						 XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
- 				OUString aEventQName(
- 					mrExport.GetNamespaceMap().GetQNameByKey(
- 							XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
- 				mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
--
--				if( nFound & FOUND_LIBRARY )
--				{
--					OUString sLocation( GetXMLToken(
--						(aStrLibrary.equalsIgnoreAsciiCaseAscii("StarOffice") ||
--					 	 aStrLibrary.equalsIgnoreAsciiCaseAscii("application") ) ? XML_APPLICATION
--															   			   : XML_DOCUMENT ) );
--					OUStringBuffer sTmp( sLocation.getLength() + aStrMacro.getLength() + 1 );
--					sTmp = sLocation;
--					sTmp.append( sal_Unicode( ':' ) );
--					sTmp.append( aStrMacro );
--					mrExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,
--										 sTmp.makeStringAndClear());
--				}
--				else
--				{
--					mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro );
--				}
--
-+				mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
- 
- 				SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
- 			}
--		}
--		else if( aStrEventType == msScript )
--		{
--			if( nFound & FOUND_MACRO )
-+			if ( nFound & FOUND_ACTION )
- 			{
--				SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
--
- 				mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey(
--							 XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
-+						 XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
- 				OUString aEventQName(
- 					mrExport.GetNamespaceMap().GetQNameByKey(
--							XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) );
-+							XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "action" ) ) ) );
- 				mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
--				mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
-+				mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aHyperURL );
- 
--				SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
-+				SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_DRAW, XML_EVENT_LISTENER, sal_True, sal_True);
- 			}
- 		}
- 	}
-+}
-+
-+void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& xShape )
-+{
-+	do
-+	{
-+		uno::Reference< document::XEventsSupplier > xEventsSupplier( xShape, uno::UNO_QUERY );
-+		if( !xEventsSupplier.is() )
-+			break;
-+
-+		uno::Reference< container::XNameReplace > xEvents( xEventsSupplier->getEvents() );
-+		DBG_ASSERT( xEvents.is(), "XEventsSupplier::getEvents() returned NULL" );
-+		if( !xEvents.is() )
-+			break;
-+
-+		static uno::Sequence< OUString > aEvents = xEvents->getElementNames();
-+		const OUString* pEvt = aEvents.getConstArray();
-+		const OUString* pEnd = aEvents.getConstArray() + aEvents.getLength();
-+
-+		for ( ; pEvt != pEnd; ++pEvt )
-+		{
-+			uno::Sequence< beans::PropertyValue > aProperties;
-+			if( !xEvents->hasByName( *pEvt ) )
-+				break;
-+
-+			if( !(xEvents->getByName( *pEvt ) >>= aProperties) )
-+				break;
-+			const beans::PropertyValue* pProperties = aProperties.getConstArray();
-+			const sal_Int32 nCount = aProperties.getLength();
-+			ImpExportEvents( pProperties, nCount );
-+		}
-+
-+	}
- 	while(0);
- }
- 
 diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport.cxx xmloff/source/draw/shapeexport.cxx
 --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/xmloff/source/draw/shapeexport.cxx	2006-03-27 11:04:25.000000000 +0100
 +++ xmloff/source/draw/shapeexport.cxx	2006-06-19 12:18:00.000000000 +0100

openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch:

Index: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch	22 Jan 2007 09:27:00 -0000	1.3
+++ openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch	19 May 2007 10:37:37 -0000	1.4
@@ -5,16 +5,16 @@
 diff -u -p -r1.3 makefile.mk
 --- openoffice.org.orig/sysui/desktop/share/makefile.mk	21 Jan 2005 11:19:32 -0000	1.3
 +++ openoffice.org/sysui/desktop/share/makefile.mk	27 Apr 2005 10:11:04 -0000
-@@ -97,9 +98,9 @@
+@@ -144,9 +144,9 @@
  	@$(MKDIRHIER) $(@:db).$(INPATH)
- 	@echo Creating desktop entries ..
+ 	@echo Creating desktop entries for $(@:f) ..
  	@echo ---------------------------------
--	@$(PERL) brand.pl -p "$(LONGPRODUCTNAME)" -u $(UNIXFILENAME) --iconprefix "$(ICONPREFIX)-" $(LAUNCHERDEPN) $(@:db).$(INPATH)
--	@$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
--	@$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
-+	@$(PERL) brand.pl -p "$(PRODUCTNAME)" -u openoffice.org --iconprefix "$(ICONPREFIX)-" $(LAUNCHERDEPN) $(@:db).$(INPATH)
-+	@$(PERL) translate.pl -p "$(PRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
-+	@$(PERL) translate.pl -p "$(PRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
+-	@$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u '$${{UNIXPRODUCTNAME}}$${{PRODUCTVERSION}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH)
+-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
+-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
++	@$(PERL) brand.pl -p '$${{PRODUCTNAME}}' -u '$${{UNIXPRODUCTNAME}}' --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH)
++	@$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
++	@$(PERL) translate.pl -p '$${{PRODUCTNAME}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
  .IF "$(WITH_LIBSN)"=="YES"
- 	@noop x$(foreach,i,$(LAUNCHERLIST) $(shell +echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x
+ 	@$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))
  .ENDIF

openoffice.org-1.9.97.rh156067.noversionedicons.patch:

Index: openoffice.org-1.9.97.rh156067.noversionedicons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.97.rh156067.noversionedicons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.97.rh156067.noversionedicons.patch	8 Jun 2005 15:16:47 -0000	1.2
+++ openoffice.org-1.9.97.rh156067.noversionedicons.patch	19 May 2007 10:37:37 -0000	1.3
@@ -1,34 +1,16 @@
-Index: desktop/redhat/makefile.mk
+Index: desktop/productversion.mk
 ===================================================================
-RCS file: /cvs/gsl/sysui/desktop/redhat/makefile.mk,v
-retrieving revision 1.13
-diff -u -p -u -r1.13 makefile.mk
---- openoffice.org.orig/sysui/desktop/redhat/makefile.mk	13 May 2005 09:28:19 -0000	1.13
-+++ openoffice.org/sysui/desktop/redhat/makefile.mk	8 Jun 2005 15:18:52 -0000
-@@ -73,7 +73,8 @@ TARGET=redhat
- # --- Files --------------------------------------------------------
+RCS file: /cvs/gsl/sysui/desktop/productversion.mk,v
+retrieving revision 1.18.2.2
+diff -u -r1.18.2.2 productversion.mk
+--- openoffice.org.orig/sysui/desktop/productversion.mk	8 May 2007 11:35:10 -0000	1.18.2.2
++++ openoffice.org/sysui/desktop/productversion.mk	18 May 2007 17:58:28 -0000
+@@ -67,7 +67,7 @@
+ PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
+ PKGVERSION.openoffice.org = $(PKGVERSION)
+ UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org)
+-ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
++ICONPREFIX.openoffice.org = openofficeorg
  
- # GNOME does not like icon names with more than one '.'
--ICONPREFIX = $(UNIXFILENAME:s/.//g)
-+#ICONPREFIX = $(UNIXFILENAME:s/.//g)
-+ICONPREFIX = openofficeorg
- 
- LAUNCHERLIST = writer calc draw impress math base printeradmin
- LAUNCHERDEPN = $(foreach,i,$(LAUNCHERLIST) $(UNIXFILENAME)-$i.desktop)
-Index: desktop/share/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 makefile.mk
---- openoffice.org.orig/sysui/desktop/share/makefile.mk	6 Jun 2005 16:26:21 -0000	1.5
-+++ openoffice.org/sysui/desktop/share/makefile.mk	8 Jun 2005 15:18:52 -0000
-@@ -79,7 +79,8 @@ TARGET=desktopshare
- # even though the "icon_filename" in '.keys' is specified as filename 
- # without extension. Since it alos does not know how to handle "9-writer"
- # type icons :-), we are stripping all '.' for now.
--ICONPREFIX = $(UNIXFILENAME:s/.//g)
-+#ICONPREFIX = $(UNIXFILENAME:s/.//g)
-+ICONPREFIX = openofficeorg
- 
- ULFFILES= \
-     documents.ulf \
+ PRODUCTNAME.broffice.org = BrOffice.org
+ PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1176
retrieving revision 1.1177
diff -u -r1.1176 -r1.1177
--- openoffice.org.spec	18 May 2007 13:36:47 -0000	1.1176
+++ openoffice.org.spec	19 May 2007 10:37:37 -0000	1.1177
@@ -9,7 +9,7 @@
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
-%define linkopt 0
+%define linkopt 1
 
 %if %{stlvisibilityfcked}
 %define stlflags --with-stlport4
@@ -112,26 +112,24 @@
 Patch53: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
 Patch54: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
 Patch55: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch56: workspace.cmcfixes32.patch
-Patch57: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch58: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch59: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch60: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
-Patch61: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch62: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch63: workspace.configrefactor01.patch
-Patch64: workspace.sixtyfour11.patch
-Patch65: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch66: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch67: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch68: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch69: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch70: openoffice.org-2.2.0.rh232389.tango.patch
-Patch71: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch72: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch73: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch74: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
-Patch75: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch56: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch57: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch58: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch59: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch60: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch61: workspace.configrefactor01.patch
+Patch62: workspace.sixtyfour11.patch
+Patch63: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch64: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch65: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
+Patch66: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
+Patch67: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
+Patch68: openoffice.org-2.2.0.rh232389.tango.patch
+Patch69: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch70: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch71: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch72: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
+Patch73: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1043,28 +1041,26 @@
 %patch53 -p1 -b .ooo73481.svx.longnotint32.patch
 %patch54 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
 %patch55 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch56 -p1 -b .workspace.cmcfixes32.patch
-%patch57 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch58 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch59 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch60 -p1 -b .ooo74255.vcl.depth.mismatch.patch
-%patch61 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch62 -p1 -b .ooo74401.basctl.boost.patch
-%patch63 -p1 -b .workspace.configrefactor01.patch
-%patch64 -p1 -b .workspace.sixtyfour11.patch
-%patch65 -p1 -b .ooo68717.gstreamer.video.patch
-%patch66 -p1 -b .ooo63159.sal.dtype.patch
-%patch67 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch68 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch69 -p1 -b .ooo75329.xdguserdir.patch
-%patch70 -p1 -b .rh232389.tango.patch
+%patch56 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch57 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch58 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch59 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch60 -p1 -b .ooo74401.basctl.boost.patch
+%patch61 -p1 -b .workspace.configrefactor01.patch
+%patch62 -p1 -b .workspace.sixtyfour11.patch
+%patch63 -p1 -b .ooo68717.gstreamer.video.patch
+%patch64 -p1 -b .ooo63159.sal.dtype.patch
+%patch65 -p1 -b .ooo75167.framework.workspacerestore.patch
+%patch66 -p1 -b .ooo75190.shell.newrecentlyused.patch
+%patch67 -p1 -b .ooo75329.xdguserdir.patch
+%patch68 -p1 -b .rh232389.tango.patch
 %if %{linkopt}
-%patch71 -p1 -b .ooo53397.linkopt.patch
+%patch69 -p1 -b .ooo53397.linkopt.patch
 %endif
-%patch72 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch73 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch74 -p1 -b .oooXXXXX.shell.reduceglobals.patch
-%patch75 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch70 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch71 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch72 -p1 -b .oooXXXXX.shell.reduceglobals.patch
+%patch73 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2645,10 +2641,13 @@
 
 %changelog
 * Fri May 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-16.1
+- a 2.2.1 release candidate
 - Resolves: rhbz#216332 use cups for all duplex and printer features
 - Resolves: rhbz#237110 Dzongkha langpack
-- a 2.2.1 release candidate
+- drop integrated workspace.cmcfixes32.patch
+- drop integrated openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
 - require Liberation fonts
+- enable link optimizations
 
 * Thu May 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.9
 - ooo#77470 Because Liberation fonts will be included in FC-7 we need


--- openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch DELETED ---


--- workspace.cmcfixes32.patch DELETED ---

More information about the fedora-extras-commits mailing list