incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1386501 [3/10] - in /incubator/ooo/branches/writer001: ./ ext_libraries/ratscan/ ext_sources/ main/ main/autodoc/source/display/html/ main/basegfx/inc/basegfx/numeric/ main/basegfx/source/numeric/ main/basegfx/source/tools/ main/basic/sour...
Date Mon, 17 Sep 2012 08:06:23 GMT
Modified: incubator/ooo/branches/writer001/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/source/msfilter/escherex.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/source/msfilter/escherex.cxx (original)
+++ incubator/ooo/branches/writer001/main/filter/source/msfilter/escherex.cxx Mon Sep 17 08:06:09 2012
@@ -24,6 +24,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_filter.hxx"
 #include "eschesdo.hxx"
+#include <svx/svdxcgv.hxx>
+#include <svx/svdomedia.hxx>
 #include <svx/xflftrit.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <svx/unoapi.hxx>
@@ -67,7 +69,6 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
@@ -1324,38 +1325,61 @@ sal_Bool EscherPropertyContainer::Create
 			if ( pGraphic )
 			{
 				GraphicObject aGraphicObject( *pGraphic );
-                ByteString aUniqueId( aGraphicObject.GetUniqueID() );
-				if ( aUniqueId.Len() )
-				{
-					AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
-					uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
+                bRetValue = CreateGraphicProperties( rXShape,aGraphicObject );
+				// End
+			}
+		}
+	}
+	return bRetValue;
+}
 
-					if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() )
-					{
-						::com::sun::star::uno::Any aAny;
-						::com::sun::star::awt::Rectangle* pVisArea = NULL;
-						if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ) ) )
-						{
-							pVisArea = new ::com::sun::star::awt::Rectangle;
-							aAny >>= (*pVisArea);
-						}
-						Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() );
-						sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
-						if ( nBlibId )
-						{
-							AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
-							ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
-							bRetValue = sal_True;
-						}
-						delete pVisArea;
-					}
-				}
+sal_Bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ,const GraphicObject& rGraphicObj )
+{
+	sal_Bool	bRetValue = sal_False;
+	ByteString aUniqueId( rGraphicObj.GetUniqueID() );
+	if ( aUniqueId.Len() )
+	{
+		AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
+		uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
+
+		if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() )
+		{
+			::com::sun::star::uno::Any aAny;
+			::com::sun::star::awt::Rectangle* pVisArea = NULL;
+			if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ) ) )
+			{
+				pVisArea = new ::com::sun::star::awt::Rectangle;
+				aAny >>= (*pVisArea);
+			}
+			Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() );
+			sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
+			if ( nBlibId )
+			{
+				AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
+				ImplCreateGraphicAttributes( aXPropSet, nBlibId, sal_False );
+				bRetValue = sal_True;
 			}
+			delete pVisArea;
 		}
 	}
 	return bRetValue;
 }
 
+sal_Bool EscherPropertyContainer::CreateMediaGraphicProperties(
+	const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape )
+{
+	sal_Bool	bRetValue = sal_False;
+	if ( rXShape.is() )
+	{
+		SdrObject* pSdrMedia( GetSdrObjectFromXShape( rXShape ) );	// SJ: leaving unoapi, because currently there is
+		if ( pSdrMedia && pSdrMedia->ISA( SdrMediaObj ) )				// no access to the native graphic object
+		{			
+			GraphicObject aGraphicObject( ((SdrMediaObj*)pSdrMedia)->getGraphic() );
+			bRetValue = CreateGraphicProperties( rXShape, aGraphicObject );
+		}
+	}
+	return bRetValue;
+}
 
 sal_Bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const ByteString& rUniqueId )
 {
@@ -2191,7 +2215,8 @@ sal_Bool EscherPropertyContainer::Create
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Int32 GetValueForEnhancedCustomShapeParameter( const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, const std::vector< sal_Int32 >& rEquationOrder )
+sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, 
+								const std::vector< sal_Int32 >& rEquationOrder, sal_Bool bAdjustTrans )
 {
 	sal_Int32 nValue = 0;
 	if ( rParameter.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
@@ -2207,22 +2232,29 @@ sal_Int32 GetValueForEnhancedCustomShape
 	{
 		case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION :
 		{
-			OSL_ASSERT(nValue < rEquationOrder.size());
-			if ( nValue < rEquationOrder.size() )
+			OSL_ASSERT((sal_uInt32)nValue < rEquationOrder.size());
+			if ( (sal_uInt32)nValue < rEquationOrder.size() )
 			{
 				nValue = (sal_uInt16)rEquationOrder[ nValue ];
 				nValue |= (sal_uInt32)0x80000000;
 			}
 		}
 		break;
-		case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
+		case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT:
 		{
-
+			if(bAdjustTrans)
+			{
+				sal_uInt32 nAdjustValue = 0;
+				sal_Bool bGot = GetOpt((sal_uInt16)( DFF_Prop_adjustValue + nValue ), nAdjustValue);
+				if(bGot) nValue = (sal_Int32)nAdjustValue;
+			}
 		}
 		break;
+		case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL :
+		default: 
+		break;
 /* not sure if it is allowed to set following values
 (but they are not yet used)
-		case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
 		case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM :
 		case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT :
 		case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP :
@@ -2351,9 +2383,19 @@ void ConvertEnhancedCustomShapeEquation(
 	}
 }
 
-sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape )
+sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , const MSO_SPT eShapeType )
 {
     sal_Bool bIsDefaultObject = sal_False;
+	switch(eShapeType)
+	{
+		//if the custom shape is not default shape of ppt, return sal_Fasle;
+		case mso_sptTearDrop:
+			return bIsDefaultObject;
+			
+		default:
+			break;
+	}
+	
     if ( pCustoShape )
     {
 	if (   pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_EQUATIONS )
@@ -2419,6 +2461,7 @@ void EscherPropertyContainer::CreateCust
     if ( aXPropSet.is() )
     {
 		SdrObjCustomShape* pCustoShape = (SdrObjCustomShape*)GetSdrObjectFromXShape( rXShape );
+		if ( !pCustoShape ) return;
 		const rtl::OUString	sCustomShapeGeometry( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeGeometry" ) );
 		uno::Any aGeoPropSet = aXPropSet->getPropertyValue( sCustomShapeGeometry );
 		uno::Sequence< beans::PropertyValue > aGeoPropSeq;
@@ -2434,10 +2477,11 @@ void EscherPropertyContainer::CreateCust
 			const rtl::OUString sAdjustmentValues	( RTL_CONSTASCII_USTRINGPARAM( "AdjustmentValues" ) );
 
 			const beans::PropertyValue* pAdjustmentValuesProp = NULL;
+			const beans::PropertyValue* pPathCoordinatesProp = NULL;
 			sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
 			uno::Sequence< beans::PropertyValues > aHandlesPropSeq;
 			sal_Bool bPredefinedHandlesUsed = sal_True;
-			sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape );
+			sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape , eShapeType);
 
 			// convert property "Equations" into std::vector< EnhancedCustomShapeEquationEquation >
 			std::vector< EnhancedCustomShapeEquation >	aEquations;
@@ -2882,38 +2926,7 @@ void EscherPropertyContainer::CreateCust
 							else if ( rrProp.Name.equals( sPathCoordinates ) )
 							{
 								if ( !bIsDefaultObject )
-								{
-									com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates;
-									if ( rrProp.Value >>= aCoordinates )
-									{
-										// creating the vertices
-										if ( (sal_uInt16)aCoordinates.getLength() )
-										{
-											sal_uInt16 j, nElements = (sal_uInt16)aCoordinates.getLength();
-											sal_uInt16 nElementSize = 8;
-											sal_uInt32 nStreamSize = nElementSize * nElements + 6;
-											SvMemoryStream aOut( nStreamSize );
-											aOut << nElements
-												<< nElements
-												<< nElementSize;
-											for( j = 0; j < nElements; j++ )
-											{
-												sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder );
-												sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder );
-												aOut << X
-													<< Y;
-											}
-											sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
-											memcpy( pBuf, aOut.GetData(), nStreamSize );
-											AddOpt( DFF_Prop_pVertices, sal_True, nStreamSize - 6, pBuf, nStreamSize );	// -6
-										}
-										else
-										{
-											sal_uInt8* pBuf = new sal_uInt8[ 1 ];
-											AddOpt( DFF_Prop_pVertices, sal_True, 0, pBuf, 0 );
-										}
-									}
-								}
+									pPathCoordinatesProp = &rrProp;
 							}
 							else if ( rrProp.Name.equals( sPathGluePoints ) )
 							{
@@ -3558,6 +3571,39 @@ void EscherPropertyContainer::CreateCust
 							AddOpt( (sal_uInt16)( DFF_Prop_adjustValue + k ), (sal_uInt32)nValue );
 				}
 			}
+			if( pPathCoordinatesProp )
+			{
+				com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates;
+				if ( pPathCoordinatesProp->Value >>= aCoordinates )
+				{
+					// creating the vertices
+					if ( (sal_uInt16)aCoordinates.getLength() )
+					{
+						sal_uInt16 j, nElements = (sal_uInt16)aCoordinates.getLength();
+						sal_uInt16 nElementSize = 8;
+						sal_uInt32 nStreamSize = nElementSize * nElements + 6;
+						SvMemoryStream aOut( nStreamSize );
+						aOut << nElements
+							<< nElements
+							<< nElementSize;
+						for( j = 0; j < nElements; j++ )
+						{
+							sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder, sal_True );
+							sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder, sal_True );
+							aOut << X
+								<< Y;
+						}
+						sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ];
+						memcpy( pBuf, aOut.GetData(), nStreamSize );
+						AddOpt( DFF_Prop_pVertices, sal_True, nStreamSize - 6, pBuf, nStreamSize );	// -6
+					}
+					else
+					{
+						sal_uInt8* pBuf = new sal_uInt8[ 1 ];
+						AddOpt( DFF_Prop_pVertices, sal_True, 0, pBuf, 0 );
+					}
+				}
+			}
 		}
 	}
 }
@@ -3616,6 +3662,37 @@ MSO_SPT EscherPropertyContainer::GetCust
 }
 
 // ---------------------------------------------------------------------------------------------
+//Implement for form control export
+sal_Bool   EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
+{
+	SdrObject* pShape = GetSdrObjectFromXShape( rXShape );
+	if ( pShape )
+	{
+		SdrModel* pMod = pShape->GetModel();
+		Graphic aGraphic(SdrExchangeView::GetObjGraphic( pMod, pShape));
+		
+        GraphicObject   aGraphicObject = aGraphic;
+        ByteString  aUniqueId = aGraphicObject.GetUniqueID();
+		if ( aUniqueId.Len() )
+		{
+			if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect )
+			{
+				Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() );
+				
+				sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, aUniqueId, aRect, NULL );
+				if ( nBlibId )
+				{					
+					AddOpt( ESCHER_Prop_pib, nBlibId, sal_True );
+					ImplCreateGraphicAttributes( rXPropSet, nBlibId, sal_False );
+					return sal_True;
+				}
+			}
+		}
+	}
+
+	return sal_False;
+
+}
 
 EscherPersistTable::EscherPersistTable()
 {

Modified: incubator/ooo/branches/writer001/main/filter/source/msfilter/eschesdo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/source/msfilter/eschesdo.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/source/msfilter/eschesdo.cxx (original)
+++ incubator/ooo/branches/writer001/main/filter/source/msfilter/eschesdo.cxx Mon Sep 17 08:06:09 2012
@@ -50,6 +50,10 @@
 #include <comphelper/extract.hxx>
 #include <svtools/fltcall.hxx>
 #include <vcl/cvtgrf.hxx>
+#include <com/sun/star/drawing/HomogenMatrix3.hpp>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -1154,6 +1158,109 @@ ImplEESdrObject::~ImplEESdrObject()
 {
 }
 
+basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape)
+{
+    basegfx::B2DRange aRetval;
+
+    try
+    {
+        if(rxShape.is())
+        {
+            if(rxShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape")))
+            {
+                // it's a group shape, iterate over children
+                const Reference< XIndexAccess > xXIndexAccess(rxShape, UNO_QUERY);
+
+                if(xXIndexAccess.is())
+                {
+                    for(sal_uInt32 n(0), nCnt = xXIndexAccess->getCount(); n < nCnt; ++n)
+                    {
+                        const Reference< XShape > axShape(xXIndexAccess->getByIndex(n), UNO_QUERY);
+
+                        if(axShape.is())
+                        {
+                            // we are calculating the bound for a group, correct rotation for sub-objects
+                            // to get the unrotated bounds for the group
+                            const basegfx::B2DRange aExtend(getUnrotatedGroupBoundRange(axShape));
+
+                            aRetval.expand(aExtend);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // iT#s a xShape, get it's transformation
+                const Reference< XPropertySet > mXPropSet(rxShape, UNO_QUERY);
+
+                if(mXPropSet.is())
+                {
+                    const Any aAny = mXPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")));
+                    
+                    if(aAny.hasValue())
+                    {
+                        HomogenMatrix3 aMatrix;
+
+                        if(aAny >>= aMatrix)
+                        {
+                            basegfx::B2DHomMatrix aHomogenMatrix;
+
+                            aHomogenMatrix.set(0, 0, aMatrix.Line1.Column1);
+                            aHomogenMatrix.set(0, 1, aMatrix.Line1.Column2);
+                            aHomogenMatrix.set(0, 2, aMatrix.Line1.Column3);
+                            aHomogenMatrix.set(1, 0, aMatrix.Line2.Column1);
+                            aHomogenMatrix.set(1, 1, aMatrix.Line2.Column2);
+                            aHomogenMatrix.set(1, 2, aMatrix.Line2.Column3);
+                            aHomogenMatrix.set(2, 0, aMatrix.Line3.Column1);
+                            aHomogenMatrix.set(2, 1, aMatrix.Line3.Column2);
+                            aHomogenMatrix.set(2, 2, aMatrix.Line3.Column3);
+
+                            basegfx::B2DVector aScale, aTranslate;
+                            double fRotate, fShearX;
+
+                            // decopose transformation
+                            aHomogenMatrix.decompose(aScale, aTranslate, fRotate, fShearX);
+
+                            // check if rotation needs to be corrected
+                            if(!basegfx::fTools::equalZero(fRotate))
+                            {
+                                // to correct, keep in mind that ppt graphics are rotated around their center
+                                const basegfx::B2DPoint aCenter(aHomogenMatrix * basegfx::B2DPoint(0.5, 0.5));
+
+                                aHomogenMatrix.translate(-aCenter.getX(), -aCenter.getY());
+                                aHomogenMatrix.rotate(-fRotate);
+                                aHomogenMatrix.translate(aCenter.getX(), aCenter.getY());
+                            }
+
+
+                            // check if shear needs to be corrected (always correct shear,
+                            // ppt does not know about it)
+                            if(!basegfx::fTools::equalZero(fShearX))
+                            {
+                                const basegfx::B2DPoint aMinimum(aHomogenMatrix * basegfx::B2DPoint(0.0, 0.0));
+
+                                aHomogenMatrix.translate(-aMinimum.getX(), -aMinimum.getY());
+                                aHomogenMatrix.shearX(-fShearX);
+                                aHomogenMatrix.translate(aMinimum.getX(), aMinimum.getY());
+                            }
+
+                            // create range. It's no longer rotated (or sheared), so use
+                            // minimum and maximum values
+                            aRetval.expand(aHomogenMatrix * basegfx::B2DPoint(0.0, 0.0));
+                            aRetval.expand(aHomogenMatrix * basegfx::B2DPoint(1.0, 1.0));
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch(::com::sun::star::uno::Exception&)
+    {
+    }
+
+    return aRetval;
+}
+
 void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
 {
 	mXPropSet = Reference< XPropertySet >::query( mXShape );
@@ -1161,12 +1268,31 @@ void ImplEESdrObject::Init( ImplEESdrWri
 	{
 		static const sal_Char aPrefix[] = "com.sun.star.";
 		static const xub_StrLen nPrefix = sizeof(aPrefix)-1;
-		SetRect( rEx.ImplMapPoint( Point( mXShape->getPosition().X, mXShape->getPosition().Y ) ),
-				 rEx.ImplMapSize( Size( mXShape->getSize().Width, mXShape->getSize().Height ) ) );
-		mType = String( mXShape->getShapeType() );
-		mType.Erase( 0, nPrefix );	// strip "com.sun.star."
-		xub_StrLen nPos = mType.SearchAscii( "Shape" );
-		mType.Erase( nPos, 5 );
+
+        // detect name first to make below test (is group) work
+        mType = String( mXShape->getShapeType() );
+        mType.Erase( 0, nPrefix );	// strip "com.sun.star."
+        xub_StrLen nPos = mType.SearchAscii( "Shape" );
+        mType.Erase( nPos, 5 );
+
+        if(GetType().EqualsAscii("drawing.Group"))
+        {
+            // if it's a group, the unrotated range is needed for that group
+            const basegfx::B2DRange aUnroatedRange(getUnrotatedGroupBoundRange(mXShape));
+            const Point aNewP(basegfx::fround(aUnroatedRange.getMinX()), basegfx::fround(aUnroatedRange.getMinY()));
+            const Size aNewS(basegfx::fround(aUnroatedRange.getWidth()), basegfx::fround(aUnroatedRange.getHeight()));
+
+            SetRect(rEx.ImplMapPoint(aNewP), rEx.ImplMapSize(aNewS));
+        }
+        else
+        {
+            // if it's no group, use position and size directly, roated/sheared or not
+            const Point aOldP(mXShape->getPosition().X, mXShape->getPosition().Y);
+            const Size aOldS(mXShape->getSize().Width, mXShape->getSize().Height);
+
+            SetRect(rEx.ImplMapPoint(aOldP), rEx.ImplMapSize(aOldS));
+        }
+
 
 		static const OUString sPresStr(rtl::OUString::createFromAscii("IsPresentationObject"));
 		static const OUString sEmptyPresStr(rtl::OUString::createFromAscii("IsEmptyPresentationObject"));

Modified: incubator/ooo/branches/writer001/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/source/msfilter/msdffimp.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/branches/writer001/main/filter/source/msfilter/msdffimp.cxx Mon Sep 17 08:06:09 2012
@@ -798,7 +798,10 @@ static basegfx::B2DPolygon GetLineArrow(
 	String& rsArrowName, sal_Bool bScaleArrow )
 {
 	basegfx::B2DPolygon aRetval;
-	double		fLineWidth = nLineWidth < 70 ? 70.0 : nLineWidth;
+	// 70 100mm = 2pt = 40 twip. In MS, line width less than 2pt has the same size arrow as 2pt
+	//If the unit is twip. Make all use this unit especailly the critical value 70/40. 
+	sal_Int32 	nLineWidthCritical = bScaleArrow ? 40 : 70;
+	double		fLineWidth = nLineWidth < nLineWidthCritical ? nLineWidthCritical : nLineWidth;;
 	double		fLenghtMul, fWidthMul;
 	sal_Int32	nLineNumber;
 	switch( eLineLenght )
@@ -816,12 +819,6 @@ static basegfx::B2DPolygon GetLineArrow(
 		case mso_lineWideArrow			: fWidthMul = 5.0; nLineNumber += 6; break;
 	}
 
-	if ( bScaleArrow )	// #i33630 arrows imported from Word are too big
-	{
-		fWidthMul /= 1.75;
-		fLenghtMul/= 1.75;
-	}
-
 	rbArrowCenter = sal_False;
 	switch ( eLineEnd )
 	{

Modified: incubator/ooo/branches/writer001/main/filter/source/msfilter/msocximex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/source/msfilter/msocximex.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/source/msfilter/msocximex.cxx (original)
+++ incubator/ooo/branches/writer001/main/filter/source/msfilter/msocximex.cxx Mon Sep 17 08:06:09 2012
@@ -1370,10 +1370,11 @@ sal_Bool OCX_CommandButton::Import( com:
 	aTmp <<= ImportColor(mnForeColor);
 	rPropSet->setPropertyValue( WW8_ASCII2STR("TextColor"), aTmp);
 
-    // fake transparent push button by setting window background color
-    if( !fBackStyle )
-        mnBackColor = 0x80000005;
-	aTmp <<= ImportColor(mnBackColor);
+	//fBackStyle is a flag. 1 means with background color. 0 means default.
+	if( fBackStyle )
+		aTmp <<= ImportColor(mnBackColor);
+	else
+		aTmp = uno::Any();
 	rPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
 
 	sal_Bool bTemp;
@@ -1432,18 +1433,21 @@ sal_Bool OCX_CommandButton::WriteContent
 	    aTmp >>= mnForeColor;
 	*rContents << ExportColor(mnForeColor);
 
+	//fBackStyle is a flag. 1 means with background color. 0 means default.
 	aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("BackgroundColor"));
     if (aTmp.hasValue())
 	    aTmp >>= mnBackColor;
+	else
+		fBackStyle = 0;
 	*rContents << ExportColor(mnBackColor);
 
 	aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("Enabled"));
 	fEnabled = any2bool(aTmp);
 	sal_uInt8 nTemp=0;//fEnabled;
 	if (fEnabled)
-		nTemp |= 0x02;
+		nTemp |= 0x02;//has enabled prop
     if (fBackStyle)
-        nTemp |= 0x08;
+        nTemp |= 0x08;//has background color
 	*rContents << nTemp;
 	*rContents << sal_uInt8(0x00);
 
@@ -1468,7 +1472,7 @@ sal_Bool OCX_CommandButton::WriteContent
     mbTakeFocus = any2bool( rPropSet->getPropertyValue( WW8_ASCII2STR( "FocusOnClick" ) ) );
 
     nFixedAreaLen = static_cast<sal_uInt16>(rContents->Tell()-nOldPos-4);
-
+	aFontData.nDefaultAlign = 1;
 	bRet = aFontData.Export(rContents,rPropSet);
 
     rContents->Seek(nOldPos);
@@ -5078,13 +5082,46 @@ sal_Bool OCX_FontData::Export(SvStorageS
 	if (bHasFont)
 	{
 		aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("FontWeight"));
-		float nBold = 0;
-		aTmp >>= nBold;
+		//Export font related props
+		if ( aTmp.hasValue() ) 
+		{
+			float nBold = 0.0;
+			aTmp >>= nBold;
+			if ( nBold >= 150 )
+				fBold = 1;
+		}
+
+		aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("FontSlant"));
+		if ( aTmp.hasValue() )
+		{
+			short eItalic = 0 ;
+			aTmp >>= eItalic ;
+			if ( eItalic == awt::FontSlant_ITALIC )
+				fItalic = 1;
+		}
 
-		if (nBold >= 150)
+		aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("FontUnderline"));
+		if ( aTmp.hasValue() )
+		{
+			short eUnderline = 0 ;
+			aTmp >>= eUnderline;
+			if ( eUnderline == awt::FontUnderline::SINGLE )
+				fUnderline = 1;
+		}
+	
+		aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("FontStrikeout"));
+		if ( aTmp.hasValue() )
+		{
+			short eLtStrikeout = 0;
+			aTmp >>= eLtStrikeout;
+			if ( eLtStrikeout == awt::FontStrikeout::SINGLE )
+				fStrike = 1;
+		}	
+		
+		sal_uInt8 nTmp= 1 * fBold  +  2* fItalic  + 4* fUnderline +  8 * fStrike; 
+		if ( nTmp > 0 )
 		{
 			nFlags |= 0x02;
-			sal_uInt8 nTmp=0x01;
 			*rContent << nTmp;
 			nTmp=0x00;
 			*rContent << nTmp;
@@ -5114,7 +5151,7 @@ sal_Bool OCX_FontData::Export(SvStorageS
 
 			aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("Align"));
 			nFlags |= 0x40;
-			sal_Int16 nAlign(0);
+			sal_Int16 nAlign = nDefaultAlign;
             if (aTmp.hasValue())
 			    aTmp >>= nAlign;
 			nJustification = ExportAlign(nAlign);
@@ -5588,6 +5625,7 @@ sal_Bool OCX_SpinButton::Export(
         0x00, 0x00, 0x00, 0x45, 0x6D, 0x62, 0x65, 0x64,
         0x64, 0x65, 0x64, 0x20, 0x4F, 0x62, 0x6A, 0x65,
         0x63, 0x74, 0x00, 0x13, 0x00, 0x00, 0x00, 0x46,
+        0x6F, 0x72, 0x6D, 0x73, 0x2E, 0x53, 0x70, 0x69,//Add those to avoid MS crash when open
         0x6E, 0x42, 0x75, 0x74, 0x74, 0x6F, 0x6E, 0x2E,
         0x31, 0x00, 0xF4, 0x39, 0xB2, 0x71, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

Modified: incubator/ooo/branches/writer001/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/source/msfilter/svdfppt.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/source/msfilter/svdfppt.cxx (original)
+++ incubator/ooo/branches/writer001/main/filter/source/msfilter/svdfppt.cxx Mon Sep 17 08:06:09 2012
@@ -3851,6 +3851,63 @@ sal_Bool PPTNumberFormatCreator::ImplGet
 				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) );
 			}
 			break;
+			case 16: // Simplified Chinese.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+			}
+			break;			
+			case 17: // Simplified Chinese with single-byte period.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
+			}
+			break;
+			case 18: // Double byte circle numbers.
+			case 19: // Wingdings white circle numbers.
+			case 20: // Wingdings black circle numbers.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_CIRCLE_NUMBER );
+			}
+			break;
+			case 21: // Traditional Chinese.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+			}
+			break;
+			case 22: // Traditional Chinese with single-byte period.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
+			}
+			break;
+			case 26: // Japanese/Korean.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+			}
+			break;
+			case 27: // Japanese/Korean with single-byte period.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+				rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( "." ) ) );
+			}
+			break;
+			case 28: // Double-byte Arabic numbers.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+			}
+			break;
+			case 29: // Double-byte Arabic numbers with double-byte period.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+				rNumberFormat.SetSuffix( String( sal_Unicode(0xff0e) ) );
+			}
+			break;
+			case 38: // Japanese with double-byte period.
+			{
+				rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH ); // No such type. Instead with Lower Chinese Number
+				rNumberFormat.SetSuffix( String( sal_Unicode(0xff0e) ) );
+			}
+			break;
 		}
 		rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
 	}
@@ -6443,7 +6500,10 @@ void PPTParagraphObj::ApplyTo( SfxItemSe
 		rSet.Put( SdrTextFixedCellHeightItem( sal_True ), SDRATTR_TEXT_USEFIXEDCELLHEIGHT );
 		SvxLineSpacingItem aItem( 200, EE_PARA_SBL );
 		if ( nVal2 <= 0 )
+		{
 			aItem.SetLineHeight( (sal_uInt16)( rManager.ScalePoint( -nVal2 ) / 8 ) );
+			aItem.GetLineSpaceRule() = SVX_LINE_SPACE_FIX;  
+		}
 		else
 		{
             sal_uInt8 nPropLineSpace = (sal_uInt8)nVal2;
@@ -6502,6 +6562,8 @@ void PPTParagraphObj::ApplyTo( SfxItemSe
         SvxTabStopItem aTabItem( 0, 0, SVX_TAB_ADJUST_DEFAULT, EE_PARA_TABS );
 		if ( GetTabCount() )
 		{
+			//paragraph offset = MIN(first_line_offset, hanging_offset)
+			sal_uInt32 nParaOffset = Min( nTextOfs2, nTab );
 			for ( i = 0; i < GetTabCount(); i++ )
 			{
 				SvxTabAdjust eTabAdjust;
@@ -6513,8 +6575,8 @@ void PPTParagraphObj::ApplyTo( SfxItemSe
 					case 3 :	eTabAdjust = SVX_TAB_ADJUST_DECIMAL; break;
 					default :	eTabAdjust = SVX_TAB_ADJUST_LEFT;
 				}
-				if ( nTab > nTextOfs2 )
-					aTabItem.Insert( SvxTabStop( (sal_uInt16)( ( ( nTab - nTextOfs2 ) * 2540 ) / 576 ), eTabAdjust ) );
+				if ( nTab > nParaOffset )//If tab stop greater than paragraph offset
+					aTabItem.Insert( SvxTabStop( ( ( (long( nTab - nTextOfs2 )) * 2540 ) / 576 ), eTabAdjust ) );
 			}
 			nLatestManTab = nTab;
 		}

Modified: incubator/ooo/branches/writer001/main/formula/inc/formula/compiler.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/formula/inc/formula/compiler.hrc?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/formula/inc/formula/compiler.hrc (original)
+++ incubator/ooo/branches/writer001/main/formula/inc/formula/compiler.hrc Mon Sep 17 08:06:09 2012
@@ -388,9 +388,14 @@
 #define SC_OPCODE_NUMBERVALUE       392
 #define SC_OPCODE_CHISQ_DIST        393
 #define SC_OPCODE_CHISQ_INV         394
-#define SC_OPCODE_STOP_2_PAR        395
+#define SC_OPCODE_AVERAGE_IF        395
+#define SC_OPCODE_XOR               396
+#define SC_OPCODE_SUM_IFS           397
+#define SC_OPCODE_AVERAGE_IFS       398
+#define SC_OPCODE_COUNT_IFS         399
+#define SC_OPCODE_STOP_2_PAR        400
 
-#define SC_OPCODE_LAST_OPCODE_ID    394      /* last OpCode */
+#define SC_OPCODE_LAST_OPCODE_ID    399      /* last OpCode */
 
 /*** Interna ***/
 #define SC_OPCODE_INTERNAL_BEGIN   9999

Modified: incubator/ooo/branches/writer001/main/formula/inc/formula/opcode.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/formula/inc/formula/opcode.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/formula/inc/formula/opcode.hxx (original)
+++ incubator/ooo/branches/writer001/main/formula/inc/formula/opcode.hxx Mon Sep 17 08:06:09 2012
@@ -274,6 +274,10 @@ enum OpCodeEnum
 		ocCountEmptyCells	= SC_OPCODE_COUNT_EMPTY_CELLS,
 		ocCountIf			= SC_OPCODE_COUNT_IF,
 		ocSumIf				= SC_OPCODE_SUM_IF,
+		ocAverageIf			= SC_OPCODE_AVERAGE_IF,
+		ocSumIfs			= SC_OPCODE_SUM_IFS,
+		ocAverageIfs		= SC_OPCODE_AVERAGE_IFS,
+		ocCountIfs			= SC_OPCODE_COUNT_IFS,
 		ocLookup			= SC_OPCODE_LOOKUP,
 		ocVLookup			= SC_OPCODE_V_LOOKUP,
 		ocHLookup			= SC_OPCODE_H_LOOKUP,
@@ -384,6 +388,7 @@ enum OpCodeEnum
         ocGetPivotData      = SC_OPCODE_GET_PIVOT_DATA,
         ocEuroConvert       = SC_OPCODE_EUROCONVERT,
 		ocNumberValue		= SC_OPCODE_NUMBERVALUE,
+		ocXor               = SC_OPCODE_XOR,
 	// internal stuff
 		ocInternalBegin		= SC_OPCODE_INTERNAL_BEGIN,
 		ocTTT				= SC_OPCODE_TTT,

Modified: incubator/ooo/branches/writer001/main/formula/source/core/resource/core_resource.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/formula/source/core/resource/core_resource.src?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/formula/source/core/resource/core_resource.src (original)
+++ incubator/ooo/branches/writer001/main/formula/source/core/resource/core_resource.src Mon Sep 17 08:06:09 2012
@@ -52,6 +52,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGL
 	String SC_OPCODE_GREATER_EQUAL { Text = ">=" ; };
 	String SC_OPCODE_AND { Text = "AND" ; };
 	String SC_OPCODE_OR { Text = "OR" ; };
+	String SC_OPCODE_XOR { Text = "XOR" ; };
 	String SC_OPCODE_INTERSECT { Text = "!" ; };
 	String SC_OPCODE_UNION { Text = "~" ; };
 	String SC_OPCODE_RANGE { Text = ":" ; };
@@ -240,6 +241,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGL
 	String SC_OPCODE_COUNT_EMPTY_CELLS { Text = "COUNTBLANK" ; };
 	String SC_OPCODE_COUNT_IF { Text = "COUNTIF" ; };
 	String SC_OPCODE_SUM_IF { Text = "SUMIF" ; };
+	String SC_OPCODE_AVERAGE_IF { Text = "AVERAGEIF" ; };
+	String SC_OPCODE_SUM_IFS { Text = "SUMIFS" ; };
+	String SC_OPCODE_AVERAGE_IFS { Text = "AVERAGEIFS" ; };
+	String SC_OPCODE_COUNT_IFS { Text = "COUNTIFS" ; };
 	String SC_OPCODE_LOOKUP { Text = "LOOKUP" ; };
 	String SC_OPCODE_V_LOOKUP { Text = "VLOOKUP" ; };
 	String SC_OPCODE_H_LOOKUP { Text = "HLOOKUP" ; };
@@ -380,6 +385,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGL
 	String SC_OPCODE_GREATER_EQUAL { Text = ">=" ; };
 	String SC_OPCODE_AND { Text = "AND" ; };
 	String SC_OPCODE_OR { Text = "OR" ; };
+	String SC_OPCODE_XOR { Text = "XOR" ; };
 	String SC_OPCODE_INTERSECT { Text = "!" ; };
 	String SC_OPCODE_UNION { Text = "~" ; };
 	String SC_OPCODE_RANGE { Text = ":" ; };
@@ -568,6 +574,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGL
 	String SC_OPCODE_COUNT_EMPTY_CELLS { Text = "COUNTBLANK" ; };
 	String SC_OPCODE_COUNT_IF { Text = "COUNTIF" ; };
 	String SC_OPCODE_SUM_IF { Text = "SUMIF" ; };
+	String SC_OPCODE_AVERAGE_IF { Text = "AVERAGEIF" ; };
+	String SC_OPCODE_SUM_IFS { Text = "SUMIFS" ; };
+	String SC_OPCODE_AVERAGE_IFS { Text = "AVERAGEIFS" ; };
+	String SC_OPCODE_COUNT_IFS { Text = "COUNTIFS" ; };
 	String SC_OPCODE_LOOKUP { Text = "LOOKUP" ; };
 	String SC_OPCODE_V_LOOKUP { Text = "VLOOKUP" ; };
 	String SC_OPCODE_H_LOOKUP { Text = "HLOOKUP" ; };
@@ -717,6 +727,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
 	{
 		Text [ en-US ] = "OR" ;
 	};
+	String SC_OPCODE_XOR
+	{
+		Text [ en-US ] = "XOR" ;
+	};
 	String SC_OPCODE_INTERSECT { Text = "!" ; };
 	String SC_OPCODE_UNION { Text = "~" ; };
 	String SC_OPCODE_RANGE { Text = ":" ; };
@@ -1459,6 +1473,22 @@ Resource RID_STRLIST_FUNCTION_NAMES
 	{
 		Text [ en-US ] = "SUMIF" ;
 	};
+	String SC_OPCODE_AVERAGE_IF
+	{
+		Text [ en-US ] = "AVERAGEIF" ;
+	};
+	String SC_OPCODE_SUM_IFS
+	{
+		Text [ en-US ] = "SUMIFS" ;
+	};
+	String SC_OPCODE_AVERAGE_IFS
+	{
+		Text [ en-US ] = "AVERAGEIFS" ;
+	};
+	String SC_OPCODE_COUNT_IFS
+	{
+		Text [ en-US ] = "COUNTIFS" ;
+	};
 	String SC_OPCODE_LOOKUP
 	{
 		Text [ en-US ] = "LOOKUP" ;

Modified: incubator/ooo/branches/writer001/main/formula/source/ui/dlg/parawin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/formula/source/ui/dlg/parawin.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/formula/source/ui/dlg/parawin.cxx (original)
+++ incubator/ooo/branches/writer001/main/formula/source/ui/dlg/parawin.cxx Mon Sep 17 08:06:09 2012
@@ -40,6 +40,7 @@
 #include "ForResId.hrc"
 
 #define VAR_ARGS 30
+#define PAIRED_VAR_ARGS (VAR_ARGS + VAR_ARGS)
 namespace formula
 {
 //============================================================================
@@ -126,7 +127,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 
             aArgName += ' ';
 			aArgName += (pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ;
 		}
-		else
+		else if ( nArgs < PAIRED_VAR_ARGS )
 		{
 			sal_uInt16 nFix = nArgs - VAR_ARGS;
 			sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix );
@@ -140,6 +141,24 @@ void ParaWin::UpdateArgDesc( sal_uInt16 
 
             aArgName += (nArg > nFix || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ;
 		}
+		else
+		{
+		    sal_uInt16 nFix = nArgs - PAIRED_VAR_ARGS;
+			sal_uInt16 nPos;
+			if ( nArg < nFix )
+			    nPos = nArg;
+			else
+			    nPos = nFix + ( (nArg-nFix) % 2);
+            sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ?
+                    aVisibleArgMapping[nPos] : aVisibleArgMapping.back());
+			aArgDesc  = pFuncDesc->getParameterDescription(nRealArg);
+			aArgName  = pFuncDesc->getParameterName(nRealArg);
+			if ( nArg >= nFix )
+				aArgName += String::CreateFromInt32((nArg-nFix)/2 + 1);
+            aArgName += ' ';
+
+            aArgName += (nArg > (nFix+1) || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ;
+		}
 
 		SetArgumentDesc(aArgDesc);
 		SetArgumentText(aArgName);
@@ -159,7 +178,7 @@ void ParaWin::UpdateArgInput( sal_uInt16
 			SetArgName		(i,pFuncDesc->getParameterName(nRealArg));
 		}
 	}
-	else
+	else if ( nArgs < PAIRED_VAR_ARGS)
 	{
 		sal_uInt16 nFix = nArgs - VAR_ARGS;
 		sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix );
@@ -177,6 +196,28 @@ void ParaWin::UpdateArgInput( sal_uInt16
 		else
 			SetArgName( i, pFuncDesc->getParameterName(nRealArg) );
 	}
+	else
+	{
+	    sal_uInt16 nFix = nArgs - PAIRED_VAR_ARGS;
+	    sal_uInt16 nPos;
+			if ( nArg < nFix )
+			    nPos = nArg;
+			else
+			    nPos = nFix + ( (nArg-nFix) % 2);
+        sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ?
+                aVisibleArgMapping[nPos] : aVisibleArgMapping.back());
+		SetArgNameFont( i,
+                (nArg > (nFix+1) || pFuncDesc->isParameterOptional(nRealArg)) ?
+                aFntLight : aFntBold );
+		if ( nArg >= nFix )
+		{
+			String aArgName( pFuncDesc->getParameterName(nRealArg) );
+			aArgName += String::CreateFromInt32((nArg-nFix)/2 + 1);
+			SetArgName( i, aArgName );
+		}
+		else
+			SetArgName( i, pFuncDesc->getParameterName(nRealArg) );
+	}
 	if(nArg<nArgs) SetArgVal(i,aParaArray[nArg]);
 	//@ aArgInput[i].SetArgVal( *(pArgArr[nOffset+i]) );
 

Modified: incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/05/00000001.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/05/00000001.xhp?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/05/00000001.xhp (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/05/00000001.xhp Mon Sep 17 08:06:09 2012
@@ -40,25 +40,25 @@
 </bookmark>
 <paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
 </variable></paragraph>
-         <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial office software.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for %PRODUCTNAME software and for the commercial office software.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the %PRODUCTNAME website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
 
          <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
-         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The %PRODUCTNAME localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the %PRODUCTNAME website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about %PRODUCTNAME, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the %PRODUCTNAME website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about %PRODUCTNAME.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, please refer to the <link href="http://www.openoffice.org/security/index.html">%PRODUCTNAME Security</link> page on our website.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of %PRODUCTNAME at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2602967" role="heading" level="2" l10n="NEW">Documentation</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the OpenOffice.org website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0120200910361765" role="heading" level="2" l10n="NEW">Participate and give back</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide OpenOffice.org community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.services.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide %PRODUCTNAME community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/guide/activex.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/guide/activex.xhp?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/guide/activex.xhp (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/guide/activex.xhp Mon Sep 17 08:06:09 2012
@@ -89,7 +89,6 @@
 </listitem>
 </list>
 <section id="relatedtopics">
-<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
 <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
 <embed href="text/shared/guide/doc_open.xhp#doc_open"/>
 <embed href="text/shared/guide/import_ms.xhp#import_ms"/>

Modified: incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/01030000.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/01030000.xhp?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/01030000.xhp (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/01030000.xhp Mon Sep 17 08:06:09 2012
@@ -46,8 +46,6 @@
 <case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
 </case>
 </switch>
-
-<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
       <embed href="text/shared/00/00000001.xhp#zurueck"/>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/source/text/shared/optionen/makefile.mk Mon Sep 17 08:06:09 2012
@@ -62,7 +62,6 @@ XHPFILES = \
    01020100.xhp \
    01020200.xhp \
    01020300.xhp \
-   01020400.xhp \
    01030000.xhp \
    01030300.xhp \
    01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/sbasic/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/sbasic/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/sbasic/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/sbasic/makefile.mk Mon Sep 17 08:06:09 2012
@@ -1184,7 +1184,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/scalc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/scalc/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/scalc/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/scalc/makefile.mk Mon Sep 17 08:06:09 2012
@@ -1197,7 +1197,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/schart/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/schart/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/schart/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/schart/makefile.mk Mon Sep 17 08:06:09 2012
@@ -885,7 +885,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/sdatabase/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/sdatabase/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/sdatabase/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/sdatabase/makefile.mk Mon Sep 17 08:06:09 2012
@@ -883,7 +883,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/sdraw/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/sdraw/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/sdraw/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/sdraw/makefile.mk Mon Sep 17 08:06:09 2012
@@ -1118,7 +1118,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/simpress/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/simpress/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/simpress/makefile.mk Mon Sep 17 08:06:09 2012
@@ -1120,7 +1120,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/smath/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/smath/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/smath/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/smath/makefile.mk Mon Sep 17 08:06:09 2012
@@ -963,7 +963,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/helpcontent2/util/swriter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/helpcontent2/util/swriter/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/helpcontent2/util/swriter/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/helpcontent2/util/swriter/makefile.mk Mon Sep 17 08:06:09 2012
@@ -1275,7 +1275,6 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020100.xhp \
    text$/shared$/optionen$/01020200.xhp \
    text$/shared$/optionen$/01020300.xhp \
-   text$/shared$/optionen$/01020400.xhp \
    text$/shared$/optionen$/01030000.xhp \
    text$/shared$/optionen$/01030300.xhp \
    text$/shared$/optionen$/01030500.xhp \

Modified: incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/localedata_euro.map
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/localedata_euro.map?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/localedata_euro.map (original)
+++ incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/localedata_euro.map Mon Sep 17 08:06:09 2012
@@ -51,6 +51,7 @@ getAllCalendars_fr_MC;
 getAllCalendars_fur_IT;
 getAllCalendars_fy_NL;
 getAllCalendars_ga_IE;
+getAllCalendars_gd_GB;
 getAllCalendars_gsc_FR;
 getAllCalendars_hr_HR;
 getAllCalendars_hsb_DE;
@@ -122,6 +123,7 @@ getAllCurrencies_fr_MC;
 getAllCurrencies_fur_IT;
 getAllCurrencies_fy_NL;
 getAllCurrencies_ga_IE;
+getAllCurrencies_gd_GB;
 getAllCurrencies_gsc_FR;
 getAllCurrencies_hr_HR;
 getAllCurrencies_hsb_DE;
@@ -193,6 +195,7 @@ getAllFormats0_fr_MC;
 getAllFormats0_fur_IT;
 getAllFormats0_fy_NL;
 getAllFormats0_ga_IE;
+getAllFormats0_gd_GB;
 getAllFormats0_gsc_FR;
 getAllFormats0_hr_HR;
 getAllFormats0_hsb_DE;
@@ -264,6 +267,7 @@ getBreakIteratorRules_fr_MC;
 getBreakIteratorRules_fur_IT;
 getBreakIteratorRules_fy_NL;
 getBreakIteratorRules_ga_IE;
+getBreakIteratorRules_gd_GB;
 getBreakIteratorRules_gsc_FR;
 getBreakIteratorRules_hr_HR;
 getBreakIteratorRules_hsb_DE;
@@ -335,6 +339,7 @@ getCollationOptions_fr_MC;
 getCollationOptions_fur_IT;
 getCollationOptions_fy_NL;
 getCollationOptions_ga_IE;
+getCollationOptions_gd_GB;
 getCollationOptions_gsc_FR;
 getCollationOptions_hr_HR;
 getCollationOptions_hsb_DE;
@@ -406,6 +411,7 @@ getCollatorImplementation_fr_MC;
 getCollatorImplementation_fur_IT;
 getCollatorImplementation_fy_NL;
 getCollatorImplementation_ga_IE;
+getCollatorImplementation_gd_GB;
 getCollatorImplementation_gsc_FR;
 getCollatorImplementation_hr_HR;
 getCollatorImplementation_hsb_DE;
@@ -477,6 +483,7 @@ getContinuousNumberingLevels_fr_MC;
 getContinuousNumberingLevels_fur_IT;
 getContinuousNumberingLevels_fy_NL;
 getContinuousNumberingLevels_ga_IE;
+getContinuousNumberingLevels_gd_GB;
 getContinuousNumberingLevels_gsc_FR;
 getContinuousNumberingLevels_hr_HR;
 getContinuousNumberingLevels_hsb_DE;
@@ -548,6 +555,7 @@ getFollowPageWords_fr_MC;
 getFollowPageWords_fur_IT;
 getFollowPageWords_fy_NL;
 getFollowPageWords_ga_IE;
+getFollowPageWords_gd_GB;
 getFollowPageWords_gsc_FR;
 getFollowPageWords_hr_HR;
 getFollowPageWords_hsb_DE;
@@ -619,6 +627,7 @@ getForbiddenCharacters_fr_MC;
 getForbiddenCharacters_fur_IT;
 getForbiddenCharacters_fy_NL;
 getForbiddenCharacters_ga_IE;
+getForbiddenCharacters_gd_GB;
 getForbiddenCharacters_gsc_FR;
 getForbiddenCharacters_hr_HR;
 getForbiddenCharacters_hsb_DE;
@@ -690,6 +699,7 @@ getIndexAlgorithm_fr_MC;
 getIndexAlgorithm_fur_IT;
 getIndexAlgorithm_fy_NL;
 getIndexAlgorithm_ga_IE;
+getIndexAlgorithm_gd_GB;
 getIndexAlgorithm_gsc_FR;
 getIndexAlgorithm_hr_HR;
 getIndexAlgorithm_hsb_DE;
@@ -761,6 +771,7 @@ getLCInfo_fr_MC;
 getLCInfo_fur_IT;
 getLCInfo_fy_NL;
 getLCInfo_ga_IE;
+getLCInfo_gd_GB;
 getLCInfo_gsc_FR;
 getLCInfo_hr_HR;
 getLCInfo_hsb_DE;
@@ -832,6 +843,7 @@ getLocaleItem_fr_MC;
 getLocaleItem_fur_IT;
 getLocaleItem_fy_NL;
 getLocaleItem_ga_IE;
+getLocaleItem_gd_GB;
 getLocaleItem_gsc_FR;
 getLocaleItem_hr_HR;
 getLocaleItem_hsb_DE;
@@ -903,6 +915,7 @@ getOutlineNumberingLevels_fr_MC;
 getOutlineNumberingLevels_fur_IT;
 getOutlineNumberingLevels_fy_NL;
 getOutlineNumberingLevels_ga_IE;
+getOutlineNumberingLevels_gd_GB;
 getOutlineNumberingLevels_gsc_FR;
 getOutlineNumberingLevels_hr_HR;
 getOutlineNumberingLevels_hsb_DE;
@@ -974,6 +987,7 @@ getReservedWords_fr_MC;
 getReservedWords_fur_IT;
 getReservedWords_fy_NL;
 getReservedWords_ga_IE;
+getReservedWords_gd_GB;
 getReservedWords_gsc_FR;
 getReservedWords_hr_HR;
 getReservedWords_hsb_DE;
@@ -1045,6 +1059,7 @@ getSearchOptions_fr_MC;
 getSearchOptions_fur_IT;
 getSearchOptions_fy_NL;
 getSearchOptions_ga_IE;
+getSearchOptions_gd_GB;
 getSearchOptions_gsc_FR;
 getSearchOptions_hr_HR;
 getSearchOptions_hsb_DE;
@@ -1116,6 +1131,7 @@ getTransliterations_fr_MC;
 getTransliterations_fur_IT;
 getTransliterations_fy_NL;
 getTransliterations_ga_IE;
+getTransliterations_gd_GB;
 getTransliterations_gsc_FR;
 getTransliterations_hr_HR;
 getTransliterations_hsb_DE;
@@ -1187,6 +1203,7 @@ getUnicodeScripts_fr_MC;
 getUnicodeScripts_fur_IT;
 getUnicodeScripts_fy_NL;
 getUnicodeScripts_ga_IE;
+getUnicodeScripts_gd_GB;
 getUnicodeScripts_gsc_FR;
 getUnicodeScripts_hr_HR;
 getUnicodeScripts_hsb_DE;

Modified: incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/i18npool/source/localedata/data/makefile.mk Mon Sep 17 08:06:09 2012
@@ -175,6 +175,7 @@ SHL3OBJS=	\
 	$(SLO)$/localedata_fur_IT.obj	\
 	$(SLO)$/localedata_fy_NL.obj	\
 	$(SLO)$/localedata_ga_IE.obj	\
+	$(SLO)$/localedata_gd_GB.obj	\
 	$(SLO)$/localedata_gsc_FR.obj	\
 	$(SLO)$/localedata_hr_HR.obj	\
 	$(SLO)$/localedata_hsb_DE.obj	\

Modified: incubator/ooo/branches/writer001/main/i18npool/source/localedata/localedata.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/i18npool/source/localedata/localedata.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/i18npool/source/localedata/localedata.cxx (original)
+++ incubator/ooo/branches/writer001/main/i18npool/source/localedata/localedata.cxx Mon Sep 17 08:06:09 2012
@@ -148,6 +148,7 @@ static const struct {
     { "eu",     lcl_DATA_EURO },
     { "fo_FO",  lcl_DATA_EURO },
     { "ga_IE",  lcl_DATA_EURO },
+    { "gd_GB",  lcl_DATA_EURO },
     { "ka_GE",  lcl_DATA_EURO },
     { "be_BY",  lcl_DATA_EURO },
     { "kl_GL",  lcl_DATA_EURO },

Modified: incubator/ooo/branches/writer001/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/i18npool/source/search/textsearch.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/i18npool/source/search/textsearch.cxx (original)
+++ incubator/ooo/branches/writer001/main/i18npool/source/search/textsearch.cxx Mon Sep 17 08:06:09 2012
@@ -723,13 +723,20 @@ void TextSearch::RESrchPrepare( const ::
 	IcuUniString aIcuSearchPatStr( (const UChar*)rPatternStr.getStr(), rPatternStr.getLength());
 #ifndef DISABLE_WORDBOUND_EMULATION
 	// for conveniance specific syntax elements of the old regex engine are emulated
-	// by using regular word boundary matching \b to replace \< and \>
-	static const IcuUniString aChevronPattern( "\\\\<|\\\\>", -1, IcuUniString::kInvariant);
-	static const IcuUniString aChevronReplace( "\\\\b", -1, IcuUniString::kInvariant);
-	static RegexMatcher aChevronMatcher( aChevronPattern, 0, nIcuErr);
-	aChevronMatcher.reset( aIcuSearchPatStr);
-	aIcuSearchPatStr = aChevronMatcher.replaceAll( aChevronReplace, nIcuErr);
-	aChevronMatcher.reset();
+	// - by replacing \< with "word-break followed by a look-ahead word-char"
+	static const IcuUniString aChevronPatternB( "\\\\<", -1, IcuUniString::kInvariant);
+	static const IcuUniString aChevronReplaceB( "\\\\b(?=\\\\w)", -1, IcuUniString::kInvariant);
+	static RegexMatcher aChevronMatcherB( aChevronPatternB, 0, nIcuErr);
+	aChevronMatcherB.reset( aIcuSearchPatStr);
+	aIcuSearchPatStr = aChevronMatcherB.replaceAll( aChevronReplaceB, nIcuErr);
+	aChevronMatcherB.reset();
+	// - by replacing \> with "look-behind word-char followed by a word-break"
+	static const IcuUniString aChevronPatternE( "\\\\>", -1, IcuUniString::kInvariant);
+	static const IcuUniString aChevronReplaceE( "(?<=\\\\w)\\\\b", -1, IcuUniString::kInvariant);
+	static RegexMatcher aChevronMatcherE( aChevronPatternE, 0, nIcuErr);
+	aChevronMatcherE.reset( aIcuSearchPatStr);
+	aIcuSearchPatStr = aChevronMatcherE.replaceAll( aChevronReplaceE, nIcuErr);
+	aChevronMatcherE.reset();
 #endif
 	pRegexMatcher = new RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags, nIcuErr);
 	if( nIcuErr)

Modified: incubator/ooo/branches/writer001/main/instsetoo_native/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/instsetoo_native/prj/build.lst?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/instsetoo_native/prj/build.lst (original)
+++ incubator/ooo/branches/writer001/main/instsetoo_native/prj/build.lst Mon Sep 17 08:06:09 2012
@@ -1,4 +1,4 @@
-oon	instsetoo_native	::	L10N:l10n postprocess packimages testautomation NULL
+oon	instsetoo_native	::	L10N:l10n postprocess packimages testautomation RAT:ratscan NULL
 oon	instsetoo_native						usr1	-	all	oon_mkout NULL
 oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
 oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL

Modified: incubator/ooo/branches/writer001/main/jpeg/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/jpeg/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/jpeg/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/jpeg/makefile.mk Mon Sep 17 08:06:09 2012
@@ -38,13 +38,10 @@ all:
 
 # --- Files --------------------------------------------------------
 
-#TARFILE_NAME=jpeg-6b
 TARFILE_NAME=jpeg-8c
 
-#TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
 TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9
 
-#PATCH_FILES=jpeg-6b.patch
 PATCH_FILES=jpeg-8c.patch
 
 ADDITIONAL_FILES=makefile.mk jconfig.h	

Modified: incubator/ooo/branches/writer001/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx (original)
+++ incubator/ooo/branches/writer001/main/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx Mon Sep 17 08:06:09 2012
@@ -69,7 +69,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     }
     else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
     {
-        fprintf(stderr,"javaldx failed! \n");
+        fprintf(stderr,"javaldx failed!\n");
         return -1;
     }
 
@@ -79,12 +79,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     if (errcode == JFW_E_INVALID_SETTINGS)
     {
-        fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!");
+        fprintf(stderr,"javaldx: invalid settings. User must select a JRE from options dialog!\n");
         return -1;
     }
     else if (errcode != JFW_E_NONE)
     {
-        fprintf(stderr,"javaldx failed! \n");
+        fprintf(stderr,"javaldx failed!\n");
         return -1;
     }
     
@@ -171,7 +171,7 @@ static bool findAndSelect(JavaInfo ** pp
     javaFrameworkError errcode = jfw_findAndSelectJRE(ppInfo);
     if (errcode == JFW_E_NO_JAVA_FOUND)
     {
-        fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n");
+        fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!\n");
         return false;
     }
     else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)

Modified: incubator/ooo/branches/writer001/main/odk/docs/install.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/docs/install.html?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/docs/install.html (original)
+++ incubator/ooo/branches/writer001/main/odk/docs/install.html Mon Sep 17 08:06:09 2012
@@ -431,7 +431,7 @@
     <td colspan="3"> 
       <div class="centertext">
 	<p><img class="apachelogo" src="images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" />
-            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
+            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
       </div>
     </td>
   </tr>

Modified: incubator/ooo/branches/writer001/main/odk/docs/notsupported.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/docs/notsupported.html?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/docs/notsupported.html (original)
+++ incubator/ooo/branches/writer001/main/odk/docs/notsupported.html Mon Sep 17 08:06:09 2012
@@ -66,7 +66,7 @@
     <td colspan="3"> 
       <div class="centertext">
 	<p><img class="apachelogo" src="images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" />
-            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
+            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
       </div>
     </td>
   </tr>

Modified: incubator/ooo/branches/writer001/main/odk/docs/tools.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/docs/tools.html?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/docs/tools.html (original)
+++ incubator/ooo/branches/writer001/main/odk/docs/tools.html Mon Sep 17 08:06:09 2012
@@ -1105,7 +1105,7 @@ types the specified types depend on.</p>
     <td colspan="3"> 
       <div class="centertext">
 	<p><img class="apachelogo" src="images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" />
-            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
+            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
       </div>
     </td>
   </tr>

Modified: incubator/ooo/branches/writer001/main/odk/examples/DevelopersGuide/examples.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/examples/DevelopersGuide/examples.html?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/examples/DevelopersGuide/examples.html (original)
+++ incubator/ooo/branches/writer001/main/odk/examples/DevelopersGuide/examples.html Mon Sep 17 08:06:09 2012
@@ -3042,7 +3042,7 @@ for the Office application.</td>
       <td colspan="3">
       <div class="centertext">
 	<p><img class="apachelogo" src="../../docs/images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" />
-            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
+            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
       </div>
     </td>
   </tr>

Modified: incubator/ooo/branches/writer001/main/odk/examples/examples.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/examples/examples.html?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/examples/examples.html (original)
+++ incubator/ooo/branches/writer001/main/odk/examples/examples.html Mon Sep 17 08:06:09 2012
@@ -761,7 +761,7 @@
     <td colspan="3"> 
       <div class="centertext">
 	<p><img class="apachelogo" src="../docs/images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" />
-            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
+            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
       </div>
     </td>
   </tr>

Modified: incubator/ooo/branches/writer001/main/odk/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/index.html?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/index.html (original)
+++ incubator/ooo/branches/writer001/main/odk/index.html Mon Sep 17 08:06:09 2012
@@ -207,7 +207,7 @@
     <td colspan="3"> 
       <div class="centertext">
 	<p><img class="apachelogo" src="docs/images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" />
-            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOfifce.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
+            Copyright &copy; 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p>
       </div>
     </td>
   </tr>

Modified: incubator/ooo/branches/writer001/main/odk/pack/copying/dk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/pack/copying/dk.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/pack/copying/dk.mk (original)
+++ incubator/ooo/branches/writer001/main/odk/pack/copying/dk.mk Mon Sep 17 08:06:09 2012
@@ -22,3 +22,4 @@
 # OpenOffice.org @@RELEASE@@ SDK dependent settings
 SDKVERSION=@@RELEASE@@
 BUILDID=@@BUILDID@@
+SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file

Modified: incubator/ooo/branches/writer001/main/odk/pack/copying/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/odk/pack/copying/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/odk/pack/copying/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/odk/pack/copying/makefile.mk Mon Sep 17 08:06:09 2012
@@ -30,6 +30,9 @@ TARGET=copying
 .INCLUDE: $(PRJ)/util/makefile.pmk
 #----------------------------------------------------------------
 
+SCM_ROOT_PATH=$(shell dirname $(SRC_ROOT))
+SCMREVISION=$(shell $(PERL) -I$(SOLARENV)/bin/modules -e "use SvnRevision; print SvnRevision::DetectRevisionId(\"$(SCM_ROOT_PATH)\")")
+
 IDLLIST:={$(subst,/,/ $(shell @$(FIND) $(IDLOUT)/com -type f))}
 DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))}
 
@@ -233,7 +236,7 @@ $(DESTDIRBIN)/addsym-macosx.sh : addsym-
 $(DESTDIRSETTINGS)/dk.mk : dk.mk
 	@@-rm -f $@
 	-$(MKDIRHIER) $(@:d)
-	tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
+	tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/' -e 's/@@SCMREVISION@@/$(SCMREVISION)/'> $@
 
 $(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
 #    $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)

Modified: incubator/ooo/branches/writer001/main/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl (original)
+++ incubator/ooo/branches/writer001/main/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl Mon Sep 17 08:06:09 2012
@@ -58,7 +58,7 @@ module com { module sun { module star { 
         <li>es : Spanish</li>
         <li>et : Estonian</li>
         <li>eu : Basque</li>
-        <li>fa : Farsi</li>
+        <li>fa : Persian</li>
         <li>fi : Finnish</li>
         <li>fr : French</li>
         <li>fy : Frisian</li>

Modified: incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRange.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRange.idl?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRange.idl (original)
+++ incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRange.idl Mon Sep 17 08:06:09 2012
@@ -96,6 +96,8 @@ published interface XNamedRange: com::su
 			as defined in <type>NamedRangeFlag</type>.
 	 */
 	void setType( [in] long nType );
+	
+
 
 };
 

Modified: incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRanges.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRanges.idl?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRanges.idl (original)
+++ incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/XNamedRanges.idl Mon Sep 17 08:06:09 2012
@@ -44,6 +44,7 @@
 
 module com {  module sun {  module star {  module sheet {
 
+
 //=============================================================================
 
 /** provides access to the members in a collection of named ranges and to
@@ -127,6 +128,7 @@ published interface XNamedRanges: com::s
 			specifies the top left cell of the output range.
 	 */
 	void outputList( [in] com::sun::star::table::CellAddress aOutputPosition );
+	
 
 };
 

Modified: incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/makefile.mk?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/makefile.mk (original)
+++ incubator/ooo/branches/writer001/main/offapi/com/sun/star/sheet/makefile.mk Mon Sep 17 08:06:09 2012
@@ -288,8 +288,11 @@ IDLFILES=\
 	XMembersSupplier.idl\
 	XMultiFormulaTokens.idl\
 	XMultipleOperation.idl\
+	RangeScopeName.idl\
 	XNamedRange.idl\
 	XNamedRanges.idl\
+	XNamedRange2.idl\
+	XNamedRanges2.idl\
 	XPrintAreas.idl\
 	XRangeSelection.idl\
 	XRangeSelectionChangeListener.idl\

Modified: incubator/ooo/branches/writer001/main/oovbaapi/ooo/vba/XApplicationBase.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/oovbaapi/ooo/vba/XApplicationBase.idl?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/oovbaapi/ooo/vba/XApplicationBase.idl (original)
+++ incubator/ooo/branches/writer001/main/oovbaapi/ooo/vba/XApplicationBase.idl Mon Sep 17 08:06:09 2012
@@ -45,7 +45,7 @@ interface XApplicationBase
 	void Quit();
 
     any CommandBars( [in] any Index );
-	void Run( [in] string Macro, [in] /*Optional*/ any Arg1, [in] /*Optional*/ any Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30);
+	any Run( [in] string Macro, [in] /*Optional*/ any Arg1, [in] /*Optional*/ any Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30);
     void OnTime( [in] any EarliestTime, [in] string Procedure, [in] any LatestTime, [in] any Schedule );
     float CentimetersToPoints([in] float Centimeters );
     void Undo();

Modified: incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/chart/converterbase.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/chart/converterbase.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/chart/converterbase.hxx (original)
+++ incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/chart/converterbase.hxx Mon Sep 17 08:06:09 2012
@@ -142,6 +142,7 @@ public:
     bool                convertFromModel(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
                             double fRotationAngle );
+	bool getAutoLayout(){return mrModel.mbAutoLayout;}
 };
 
 // ============================================================================

Modified: incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/table/tableproperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/table/tableproperties.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/table/tableproperties.hxx (original)
+++ incubator/ooo/branches/writer001/main/oox/inc/oox/drawingml/table/tableproperties.hxx Mon Sep 17 08:06:09 2012
@@ -62,7 +62,7 @@ public:
 
 private:
 
-	const TableStyle&					getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase );
+	const TableStyle&					getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase,  sal_Bool &isCreateTabStyle);
 
 	rtl::OUString						maStyleId;				// either StyleId is available
 	boost::shared_ptr< TableStyle >		mpTableStyle;			// or the complete TableStyle

Modified: incubator/ooo/branches/writer001/main/oox/inc/oox/xls/defnamesbuffer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/oox/inc/oox/xls/defnamesbuffer.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/oox/inc/oox/xls/defnamesbuffer.hxx (original)
+++ incubator/ooo/branches/writer001/main/oox/inc/oox/xls/defnamesbuffer.hxx Mon Sep 17 08:06:09 2012
@@ -155,7 +155,7 @@ private:
     typedef ::std::auto_ptr< StreamDataSequence >   StreamDataSeqPtr;
     typedef ::std::auto_ptr< BiffInputStreamPos >   BiffStreamPosPtr;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
+    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange2 >
                         mxNamedRange;       /// XNamedRange interface of the defined name.
     sal_Int32           mnTokenIndex;       /// Name index used in API token array.
     sal_Int16           mnCalcSheet;        /// Calc sheet index for sheet-local names.

Modified: incubator/ooo/branches/writer001/main/oox/inc/oox/xls/workbookhelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/oox/inc/oox/xls/workbookhelper.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/oox/inc/oox/xls/workbookhelper.hxx (original)
+++ incubator/ooo/branches/writer001/main/oox/inc/oox/xls/workbookhelper.hxx Mon Sep 17 08:06:09 2012
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespac
     namespace container { class XNameContainer; }
     namespace lang { class XMultiServiceFactory; }
     namespace sheet { class XDatabaseRange; }
-    namespace sheet { class XNamedRange; }
+    namespace sheet { class XNamedRange2; }
     namespace sheet { class XSpreadsheet; }
     namespace sheet { class XSpreadsheetDocument; }
     namespace style { class XStyle; }
@@ -182,9 +182,10 @@ public:
     /** Creates and returns a defined name on-the-fly in the Calc document.
         The name will not be buffered in the global defined names buffer.
         @param orName  (in/out-parameter) Returns the resulting used name. */
-    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
+    ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange2 >
                         createNamedRangeObject(
                             ::rtl::OUString& orName,
+							sal_Int32 nSheetId = -1, //Add scope for name range
                             sal_Int32 nNameFlags = 0 ) const;
 
     /** Creates and returns a database range on-the-fly in the Calc document.



Mime
View raw message