incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [23/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animc...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdtrans.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdtrans.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdtrans.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdtrans.cxx Wed Jun 27 13:44:09 2012
@@ -886,191 +886,66 @@ void SdrFormatter::TakeStr(long nVal, Xu
 
 void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr)
 {
+	const sal_Char* pText;
+
 	switch(eUnit)
 	{
-		// Metrisch
-		case MAP_100TH_MM   :
-		{
-			sal_Char aText[] = "/100mm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_10TH_MM    :
-		{
-			sal_Char aText[] = "/10mm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_MM         :
-		{
-			sal_Char aText[] = "mm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_CM         :
-		{
-			sal_Char aText[] = "cm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-
-		// Inch
-		case MAP_1000TH_INCH:
-		{
-			sal_Char aText[] = "/1000\"";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_100TH_INCH :
-		{
-			sal_Char aText[] = "/100\"";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_10TH_INCH  :
-		{
-			sal_Char aText[] = "/10\"";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_INCH       :
-		{
-			rStr = UniString();
-			rStr += sal_Unicode('"');
-			break;
-		}
-		case MAP_POINT      :
-		{
-			sal_Char aText[] = "pt";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_TWIP       :
-		{
-			sal_Char aText[] = "twip";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-
-		// Sonstiges
-		case MAP_PIXEL      :
-		{
-			sal_Char aText[] = "pixel";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_SYSFONT    :
-		{
-			sal_Char aText[] = "sysfont";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_APPFONT    :
-		{
-			sal_Char aText[] = "appfont";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case MAP_RELATIVE   :
-		{
-			rStr = UniString();
-			rStr += sal_Unicode('%');
-			break;
-		}
-		default: break;
+		// metric units
+		case MAP_100TH_MM	: pText = "/100mm"; break;
+		case MAP_10TH_MM	: pText = "/10mm"; break;
+		case MAP_MM			: pText = "mm"; break;
+		case MAP_CM			: pText = "cm"; break;
+
+		// imperial units
+		case MAP_1000TH_INCH: pText = "/1000\""; break;
+		case MAP_100TH_INCH	: pText = "/100\""; break;
+		case MAP_10TH_INCH	: pText = "/10\""; break;
+		case MAP_INCH		: pText = "\""; break;
+		case MAP_POINT		: pText = "pt"; break;
+		case MAP_TWIP		: pText = "twip"; break;
+
+		// other units
+		case MAP_PIXEL		: pText = "pixel"; break;
+		case MAP_SYSFONT	: pText = "sysfont"; break;
+		case MAP_APPFONT	: pText = "appfont"; break;
+		case MAP_RELATIVE	: pText = "\%"; break;
+
+		default				: pText = ""; break;
 	}
+
+	rStr = XubString::CreateFromAscii( pText );
 }
 
 void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
 {
+	const sal_Char* pText;
+
 	switch(eUnit)
 	{
-		default				:
-		case FUNIT_NONE		:
-		case FUNIT_CUSTOM	:
-		{
-			rStr = UniString();
-			break;
-		}
-
-		// Metrisch
-		case FUNIT_100TH_MM:
-		{
-			sal_Char aText[] = "/100mm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_MM     :
-		{
-			sal_Char aText[] = "mm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_CM     :
-		{
-			sal_Char aText[] = "cm";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_M      :
-		{
-			rStr = UniString();
-			rStr += sal_Unicode('m');
-			break;
-		}
-		case FUNIT_KM     :
-		{
-			sal_Char aText[] = "km";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-
-		// Inch
-		case FUNIT_TWIP   :
-		{
-			sal_Char aText[] = "twip";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_POINT  :
-		{
-			sal_Char aText[] = "pt";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_PICA   :
-		{
-			sal_Char aText[] = "pica";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_INCH   :
-		{
-			rStr = UniString();
-			rStr += sal_Unicode('"');
-			break;
-		}
-		case FUNIT_FOOT   :
-		{
-			sal_Char aText[] = "ft";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-		case FUNIT_MILE   :
-		{
-			sal_Char aText[] = "mile(s)";
-			rStr = UniString(aText, sizeof(aText-1));
-			break;
-		}
-
-		// sonstiges
-		case FUNIT_PERCENT:
-		{
-			rStr = UniString();
-			rStr += sal_Unicode('%');
-			break;
-		}
+		// metric units
+		case FUNIT_100TH_MM	: pText = "/100mm"; break;
+		case FUNIT_MM		: pText = "mm"; break;
+		case FUNIT_CM		: pText = "cm"; break;
+		case FUNIT_M		: pText = "m"; break;
+		case FUNIT_KM		: pText = "km"; break;
+
+		// imperial units
+		case FUNIT_TWIP		: pText = "twip"; break;
+		case FUNIT_POINT	: pText = "pt"; break;
+		case FUNIT_PICA		: pText = "pica"; break;
+		case FUNIT_INCH		: pText = "\""; break;
+		case FUNIT_FOOT		: pText = "ft"; break;
+		case FUNIT_MILE		: pText = "mile(s)"; break;
+
+		// other units
+		case FUNIT_PERCENT: pText = "\%"; break;
+
+//		case FUNIT_NONE		:
+//		case FUNIT_CUSTOM	:
+		default				: pText = ""; break;
 	}
+
+	rStr = XubString::CreateFromAscii( pText );
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx Wed Jun 27 13:44:09 2012
@@ -236,7 +236,7 @@ XubString SdrUndoGroup::GetSdrRepeatComm
 {
 	XubString aRet(maComment);
 	const sal_Char aSearchText[] = "%1";
-	const String aSearchString(aSearchText, sizeof(aSearchText-1));
+	const String aSearchString(aSearchText, sizeof(aSearchText - 1));
 
 	aRet.SearchAndReplace(aSearchString, ImpGetResStr(STR_ObjNameSingulPlural));
 
@@ -255,7 +255,7 @@ void SdrUndoObj::GetDescriptionStringFor
 {
 	rStr = ImpGetResStr(nStrCacheID);
 	const sal_Char aSearchText[] = "%1";
-	const String aSearchString(aSearchText, sizeof(aSearchText-1));
+	const String aSearchString(aSearchText, sizeof(aSearchText - 1));
 	const xub_StrLen nPos(rStr.Search(aSearchString));
 
 	if(STRING_NOTFOUND != nPos)
@@ -293,13 +293,31 @@ void SdrUndoObj::ImpShowPageOfThisObject
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+void SdrUndoAttrObj::ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet)
+{
+    SfxStyleSheetBase* pThere = rStyleSheetPool.Find(rSheet.GetName(), rSheet.GetFamily());
+
+    if(!pThere)
+    {
+        // re-insert remembered style which was removed in the meantime. To do this
+        // without assertion, do it without parent and set parent after insertion
+        const UniString aParent(rSheet.GetParent());
+        
+        rSheet.SetParent(UniString());
+        rStyleSheetPool.Insert(&rSheet);
+        rSheet.SetParent(aParent);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSaveText)
 :	SdrUndoObj(rNewObj),
 	mpUndoItemSet(0),
 	mpRedoItemSet(0),
 	mpRepeatItemSet(0),
-	mpUndoStyleSheet(0),
-	mpRedoStyleSheet(0),
+    mxUndoStyleSheet(),
+    mxRedoStyleSheet(),
 	mpTextUndoOPO(0),
 	mpTextRedoOPO(0),
 	mpUndoGroup(0),
@@ -332,7 +350,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject
 
 		if(mbStyleSheet)
 		{
-			mpUndoStyleSheet = mrSdrObject.GetStyleSheet();
+			mxUndoStyleSheet = mrSdrObject.GetStyleSheet();
 		}
 
 		if(bSaveText)
@@ -413,7 +431,7 @@ void SdrUndoAttrObj::Undo()
 
 			if(mbStyleSheet)
 			{
-				mpRedoStyleSheet=mrSdrObject.GetStyleSheet();
+				mxRedoStyleSheet = mrSdrObject.GetStyleSheet();
 			}
 
 			if(mpTextUndoOPO)
@@ -430,8 +448,18 @@ void SdrUndoAttrObj::Undo()
 
 		if(mbStyleSheet)
 		{
-			mpRedoStyleSheet = mrSdrObject.GetStyleSheet();
-			mrSdrObject.SetStyleSheet(mpUndoStyleSheet, true);
+			mxRedoStyleSheet = mrSdrObject.GetStyleSheet();
+            SfxStyleSheet* pSheet = dynamic_cast< SfxStyleSheet* >(mxUndoStyleSheet.get());
+
+            if(pSheet && mrSdrObject.getSdrModelFromSdrObject().GetStyleSheetPool())
+            {
+                ensureStyleSheetInStyleSheetPool(*mrSdrObject.getSdrModelFromSdrObject().GetStyleSheetPool(), *pSheet);
+    			mrSdrObject.SetStyleSheet(pSheet, true);
+            }
+            else
+            {
+                OSL_ENSURE(false, "OOps, something went wrong in SdrUndoAttrObj (!)");
+            }
 		}
 
 		sdr::properties::ItemChangeBroadcaster aItemChange(mrSdrObject);
@@ -502,8 +530,18 @@ void SdrUndoAttrObj::Redo()
 	{
 		if(mbStyleSheet)
 		{
-			mpUndoStyleSheet = mrSdrObject.GetStyleSheet();
-			mrSdrObject.SetStyleSheet(mpRedoStyleSheet, true);
+			mxUndoStyleSheet = mrSdrObject.GetStyleSheet();
+            SfxStyleSheet* pSheet = dynamic_cast< SfxStyleSheet* >(mxRedoStyleSheet.get());
+
+            if(pSheet && mrSdrObject.getSdrModelFromSdrObject().GetStyleSheetPool())
+            {
+                ensureStyleSheetInStyleSheetPool(*mrSdrObject.getSdrModelFromSdrObject().GetStyleSheetPool(), *pSheet);
+			    mrSdrObject.SetStyleSheet(pSheet, true);
+            }
+            else
+            {
+                OSL_ENSURE(false, "OOps, something went wrong in SdrUndoAttrObj (!)");
+            }
 		}
 
 		sdr::properties::ItemChangeBroadcaster aItemChange(mrSdrObject);

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx Wed Jun 27 13:44:09 2012
@@ -643,18 +643,8 @@ GDIMetaFile SdrExchangeView::GetMarkedOb
             {
                 Graphic aGraphic( pSdrGrafObj->GetTransformedGraphic() );
 
-                if(GRAPHIC_BITMAP == aGraphic.GetType())
-                {
-                    const Point aPos;
-
-                    aMtf.AddAction( new MetaBmpExScaleAction( aPos, aBoundSize, aGraphic.GetBitmapEx() ) );
-        		    aMtf.SetPrefMapMode( aMap );
-                	aMtf.SetPrefSize( aBoundSize );
-                }
-                else if(GRAPHIC_GDIMETAFILE == aGraphic.GetType())
-				{
-                    aMtf = aGraphic.GetGDIMetaFile();
-                }
+                // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+                aMtf = aGraphic.GetGDIMetaFile();
 	    	}
 		}
 

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/table/cell.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/table/cell.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/table/cell.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/table/cell.cxx Wed Jun 27 13:44:09 2012
@@ -258,6 +258,16 @@ namespace sdr
 				sdr::table::SdrTableObj& rObj = (sdr::table::SdrTableObj&)GetSdrObject();
 				if( rObj.IsVerticalWriting() != bVertical )
 					rObj.SetVerticalWriting(bVertical);
+
+				// Set a cell vertical property
+				OutlinerParaObject* pParaObj = mxCell->GetEditOutlinerParaObject();
+				if( pParaObj == 0 )
+					pParaObj = mxCell->GetOutlinerParaObject();
+				if(pParaObj)
+				{
+					pParaObj->SetVertical(bVertical);
+				}
+
 			}
 
 			// call parent

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/table/svdotable.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/table/svdotable.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/table/svdotable.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/table/svdotable.cxx Wed Jun 27 13:44:09 2012
@@ -1393,12 +1393,12 @@ void SdrTableObj::onEditOutlinerStatusEv
 
 void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-	rInfo.bResizeFreeAllowed = true;
-	rInfo.bResizePropAllowed = true;
-	rInfo.bRotateFreeAllowed = false;
-	rInfo.bRotate90Allowed = false;
-	rInfo.bMirrorFreeAllowed = false;
-	rInfo.bMirror45Allowed = false;
+	rInfo.mbResizeFreeAllowed = true;
+	rInfo.mbResizePropAllowed = true;
+	rInfo.mbRotateFreeAllowed = false;
+	rInfo.mbRotate90Allowed = false;
+	rInfo.mbMirrorFreeAllowed = false;
+	rInfo.mbMirror45Allowed = false;
 	rInfo.mbMirror90Allowed = false;
 
 	// allow transparence

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/UnoGraphicExporter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/UnoGraphicExporter.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/UnoGraphicExporter.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/UnoGraphicExporter.cxx Wed Jun 27 13:44:09 2012
@@ -218,36 +218,37 @@ namespace svx
 
 	/** creates a bitmap that is optionaly transparent from a metafile
 	*/
-	BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, bool bTransparent, const Size aSize)
+	BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, bool bTransparent, const Size& rSize)
 	{
-		Graphic     aGraphic( rMtf );
-		BitmapEx	aBmpEx;
+		BitmapEx aBmpEx;
 
-        // #i102089# support user's settings of AA and LineSnap when the MetaFile gets
-        // rasterconverted to a bitmap
-        const SvtOptionsDrawinglayer aDrawinglayerOpt;
-        const GraphicConversionParameters aParameters(
-            aSize,
-            true, // allow unlimited size
-            aDrawinglayerOpt.IsAntiAliasing(),
-            aDrawinglayerOpt.IsSnapHorVerLinesToDiscrete());
-
-		if( bTransparent )
+		if(bTransparent)
 		{
-			Graphic aMaskGraphic(rMtf.GetMonochromeMtf(COL_BLACK));
-			Bitmap  aMaskBmp(aMaskGraphic.GetBitmap(aParameters));
+            // use new primitive conversion tooling
+            basegfx::B2DRange aRange(basegfx::B2DPoint(0.0, 0.0));
 
-			aMaskBmp.Convert(BMP_CONVERSION_1BIT_THRESHOLD);
-			aBmpEx = BitmapEx(aGraphic.GetBitmap(aParameters), aMaskBmp);
+            // use 100th mm for primitive bitmap converter tool, input is pixel
+            // use a real OutDev to get the correct DPI, the static LogicToLogic assumes 72dpi which is wrong (!)
+            const Size aSize100th(Application::GetDefaultDevice()->PixelToLogic(rSize, MapMode(MAP_100TH_MM)));
+                    
+            aRange.expand(basegfx::B2DPoint(aSize100th.Width(), aSize100th.Height()));
+            aBmpEx = convertMetafileToBitmapEx(rMtf, aRange);
 		}
 		else
         {
+            const SvtOptionsDrawinglayer aDrawinglayerOpt;
+            const GraphicConversionParameters aParameters(
+                rSize, 
+                true, // allow unlimited size
+                aDrawinglayerOpt.IsAntiAliasing(),
+                aDrawinglayerOpt.IsSnapHorVerLinesToDiscrete());
+    		const Graphic aGraphic(rMtf);
+
 			aBmpEx = BitmapEx(aGraphic.GetBitmap(aParameters));
+		    aBmpEx.SetPrefMapMode( rMtf.GetPrefMapMode() );
+		    aBmpEx.SetPrefSize( rMtf.GetPrefSize() );
         }
 
-		aBmpEx.SetPrefMapMode( rMtf.GetPrefMapMode() );
-		aBmpEx.SetPrefSize( rMtf.GetPrefSize() );
-
 		return aBmpEx;
 	}
 

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopool.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopool.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopool.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopool.cxx Wed Jun 27 13:44:09 2012
@@ -66,7 +66,18 @@ SvxUnoDrawPool::SvxUnoDrawPool( SdrModel
 
 SvxUnoDrawPool::~SvxUnoDrawPool() throw()
 {
+    // memory leak #119991#: to release the secondary pool created in function SvxUnoDrawPool::init()
+    SfxItemPool* pSecondaryPool = mpDefaultsPool->GetSecondaryPool();
+
+    // #119991# delete master pool first, this will reset the pMaster entry in pSecondaryPool as needed.
+    // This is the needed order (see SdrModel::~SdrModel for example)
     SfxItemPool::Free(mpDefaultsPool);
+
+    // delete pSecondaryPool if exists
+    if(pSecondaryPool)
+    {
+        SfxItemPool::Free(pSecondaryPool);
+    }
 }
 
 void SvxUnoDrawPool::init()

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap4.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap4.cxx Wed Jun 27 13:44:09 2012
@@ -250,18 +250,8 @@ bool SvxOle2Shape::getPropertyValueImpl(
 				    }
 				    if ( !bIsWMF )
 				    {
-					    GDIMetaFile aMtf;
-					    if ( pGraphic->GetType() != GRAPHIC_BITMAP )
-						    aMtf = pObj->GetGraphic()->GetGDIMetaFile();
-					    else
-					    {
-						    VirtualDevice aVirDev;
-						    aMtf.Record( &aVirDev );
-						    pGraphic->Draw( &aVirDev, Point(),  pGraphic->GetPrefSize() );
-						    aMtf.Stop();
-						    aMtf.SetPrefSize( pGraphic->GetPrefSize() );
-						    aMtf.SetPrefMapMode( pGraphic->GetPrefMapMode() );
-					    }
+                        // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+					    GDIMetaFile aMtf(pObj->GetGraphic()->GetGDIMetaFile());
 					    SvMemoryStream aDestStrm( 65535, 65535 );
 					    ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
                         const uno::Sequence<sal_Int8> aSeq(
@@ -420,7 +410,7 @@ sal_Bool SvxOle2Shape::createObject( con
     ::comphelper::IEmbeddedHelper*     pPersist = mpModel->GetPersist();
     ::rtl::OUString              aPersistName;
     OUString            aTmpStr;
-	if( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
+	if( SvxShape::getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
         aPersistName = aTmpStr;
 
     //TODO/LATER: how to cope with creation failure?!
@@ -451,7 +441,7 @@ sal_Bool SvxOle2Shape::createObject( con
         }
 
 		// connect the object after the visual area is set
-        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
+        SvxShape::setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
 
 		// the object is inserted during setting of PersistName property usually
 		if( pOle2Obj->IsEmpty() )
@@ -514,7 +504,7 @@ sal_Bool SvxOle2Shape::createLink( const
         }
 
 		// connect the object after the visual area is set
-        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
+        SvxShape::setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
 
 		// the object is inserted during setting of PersistName property usually
 		if ( pOle2Obj->IsEmpty() )

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx Wed Jun 27 13:44:09 2012
@@ -3176,18 +3176,8 @@ bool SvxShape::getPropertyValueImpl( con
                     }
                     if ( !bIsWMF )
                     {
-					    GDIMetaFile aMtf;
-					    if ( pGraphic->GetType() != GRAPHIC_BITMAP )
-						    aMtf = pObj->GetGraphic()->GetGDIMetaFile();
-					    else
-					    {
-						    VirtualDevice aVirDev;
-						    aMtf.Record( &aVirDev );
-						    pGraphic->Draw( &aVirDev, Point(),  pGraphic->GetPrefSize() );
-						    aMtf.Stop();
-						    aMtf.SetPrefSize( pGraphic->GetPrefSize() );
-						    aMtf.SetPrefMapMode( pGraphic->GetPrefMapMode() );
-					    }
+                        // #119735# just use GetGDIMetaFile, it will create a bufferd version of contained bitmap now automatically
+					    GDIMetaFile aMtf(pObj->GetGraphic()->GetGDIMetaFile());
                         SvMemoryStream aDestStrm( 65535, 65535 );
                         ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False );
                         const uno::Sequence<sal_Int8> aSeq(

Modified: incubator/ooo/branches/alg/aw080/main/sw/inc/docstyle.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/inc/docstyle.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/inc/docstyle.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/inc/docstyle.hxx Wed Jun 27 13:44:09 2012
@@ -219,9 +219,6 @@ public:
 	void	SetOrganizerMode( sal_Bool bMode )	{ bOrganizer = bMode; }
 	sal_Bool 	IsOrganizerMode() const 		{ return bOrganizer; }
 
-	virtual SfxStyleSheetIterator* CreateIterator( SfxStyleFamily,
-													sal_uInt16 nMask );
-
 	SwDoc& GetDoc() const { return rDoc; }
 
 	void dispose();

Modified: incubator/ooo/branches/alg/aw080/main/sw/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
 VERBOSEFLAG := -s
 .ENDIF
 
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docedt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docedt.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docedt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docedt.cxx Wed Jun 27 13:44:09 2012
@@ -2518,6 +2518,11 @@ SetRedlineMode( eOld );
 			rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
 												nPtCnt );
 
+            if ( bJoinTxt && !bJoinPrev )
+            {
+                rPam.Move( fnMoveBackward );
+            }
+
 			if( pUndoRpl )
             {
                 pUndoRpl->SetEnd(rPam);

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/docnode/ndcopy.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/docnode/ndcopy.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/docnode/ndcopy.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/docnode/ndcopy.cxx Wed Jun 27 13:44:09 2012
@@ -354,11 +354,23 @@ sal_Bool lcl_CopyTblBox( const SwTableBo
 		pNewBox = new SwTableBox( pBoxFmt, nLines, pCT->pInsLine );
 	else
 	{
+		//Modified for i119955,2012.6.13
+		//Avoid overflow problem...
+		int nIn = rpBox->GetSttIdx() - pCT->nOldTblSttIdx;
+		if ( nIn > 0 )
+		{
+		//End
 		SwNodeIndex aNewIdx( *pCT->pTblNd,
 							rpBox->GetSttIdx() - pCT->nOldTblSttIdx );
 		ASSERT( aNewIdx.GetNode().IsStartNode(), "Index nicht auf einem StartNode" );
 		pNewBox = new SwTableBox( pBoxFmt, aNewIdx, pCT->pInsLine );
         pNewBox->setRowSpan( rpBox->getRowSpan() );
+		//Modified for i119955,2012.6.13
+		}else
+		{
+			return sal_False;
+		}
+		//End
 	}
 
 	pCT->pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pNewBox,

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx Wed Jun 27 13:44:09 2012
@@ -1512,12 +1512,14 @@ void SwDrawContact::_Changed(
                 _InvalidateObjs();
                 // --> OD 2004-11-11 #i35007# - notify anchor frame
                 // of as-character anchored object
-                if ( bAnchoredAsChar )
                 {
-                    const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)
-                        ->AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+					//-->Modified for i119654,2012.6.8                        
+					SwFrm *pAnchorFrame = NULL;
+                    if ( pAnchoredDrawObj && ( pAnchorFrame = 
+							const_cast<SwAnchoredDrawObject*>( pAnchoredDrawObj )->AnchorFrm() ) )
+						pAnchorFrame->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+					//<--
                 }
-                // <--
             }
         }
     }

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dflyobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dflyobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dflyobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dflyobj.cxx Wed Jun 27 13:44:09 2012
@@ -622,13 +622,9 @@ void SwVirtFlyDrawObj::wrap_DoPaintObjec
 
 void __EXPORT SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
 {
-	rInfo.bSelectAllowed	 = rInfo.bMoveAllowed =
-	rInfo.bResizeFreeAllowed = rInfo.bResizePropAllowed = true;
-
-	rInfo.bRotateFreeAllowed = rInfo.bRotate90Allowed =
-	rInfo.bMirrorFreeAllowed = rInfo.bMirror45Allowed =
-	rInfo.mbMirror90Allowed   = rInfo.mbShearAllowed	  =
-	rInfo.mbCanConvToPath	 = rInfo.mbCanConvToPoly	  =
+	rInfo.mbSelectAllowed = rInfo.mbMoveAllowed = rInfo.mbResizeFreeAllowed = rInfo.mbResizePropAllowed = true;
+	rInfo.mbRotateFreeAllowed = rInfo.mbRotate90Allowed = rInfo.mbMirrorFreeAllowed = rInfo.mbMirror45Allowed =
+	rInfo.mbMirror90Allowed = rInfo.mbShearAllowed = rInfo.mbCanConvToPath = rInfo.mbCanConvToPoly =
 	rInfo.mbCanConvToPathLineToArea = rInfo.mbCanConvToPolyLineToArea = false;
 }
 

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edattr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edattr.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edattr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edattr.cxx Wed Jun 27 13:44:09 2012
@@ -429,6 +429,13 @@ sal_Bool lcl_IsNoEndTxtAttrAtPos( const 
             ASSERT( rTNd.GetNumRule(),
                     "<lcl_IsNoEndTxtAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." );
             const SwNumRule* pNumRule = rTNd.GetNumRule();
+			//Modified for i119959,2012.6.12
+			//Under this scenario,this pointer is null,but on win,it doesn't crash immediately
+			//it exits with exception,and associated memory will have problem which leads to crash problem in 
+			//other place in dev env...
+			if ( pNumRule )
+			{
+			//End
             const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<sal_uInt16>(rTNd.GetActualListLevel()) );
             if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() )
             {
@@ -436,7 +443,13 @@ sal_Bool lcl_IsNoEndTxtAttrAtPos( const 
                     sExp = rNumFmt.GetBulletChar();
                 else
                     sExp = rTNd.GetNumString();
-            }
+				}
+			//Modified for i119959,2012.6.12
+			//Under this scenario,this pointer is null,but on win,it doesn't crash immediately
+			//it exits with exception,and associated memory will have problem which leads to crash problem in 
+			//other place in dev env...
+			}
+			//End
         }
     }
 

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/eddel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/eddel.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/eddel.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/eddel.cxx Wed Jun 27 13:44:09 2012
@@ -57,7 +57,10 @@ void SwEditShell::DeleteSel( SwPaM& rPam
 	//	1. Point und Mark stehen in einer Box, Selection normal loeschen
 	//	2. Point und Mark stehen in unterschiedlichen Boxen, alle
 	// selektierten Boxen suchen in den Inhalt loeschen
-	if( rPam.GetNode()->FindTableNode() &&
+
+	//Comment:If the point is outside of a table and the mark point is in the a table cell,
+	//			should go throw the following code
+	if( (rPam.GetNode()->FindTableNode() || rPam.GetNode(sal_False)->FindTableNode()) &&
 		rPam.GetNode()->StartOfSectionNode() !=
 		rPam.GetNode(sal_False)->StartOfSectionNode() )
 	{
@@ -72,7 +75,11 @@ void SwEditShell::DeleteSel( SwPaM& rPam
 		do {
 			aDelPam.SetMark();
 			SwNode* pNd = aDelPam.GetNode();
-			const SwNode& rEndNd = *pNd->EndOfSectionNode();
+			//Comment:If the point is outside of table, select the table start node as the end node of current selection node
+			const SwNode& rEndNd = !rPam.GetNode()->FindTableNode() && !pNd->FindTableNode()?
+						*(SwNode*)(rPam.GetNode(sal_False)->FindTableNode())
+						:
+						*pNd->EndOfSectionNode();
 			if( pEndSelPos->nNode.GetIndex() <= rEndNd.GetIndex() )
 			{
 				*aDelPam.GetPoint() = *pEndSelPos;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edtab.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edtab.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edtab.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/edit/edtab.cxx Wed Jun 27 13:44:09 2012
@@ -61,6 +61,42 @@ using namespace ::com::sun::star::uno;
 
 extern void ClearFEShellTabCols();
 
+//Added for bug 119954:Application crashed if undo/redo covert nest table to text
+sal_Bool ConvertTableToText( const SwTableNode *pTableNode, sal_Unicode cCh );
+
+void	ConvertNestedTablesToText( const SwTableLines &rTableLines, sal_Unicode cCh )
+{
+	for( sal_uInt16 n = 0; n < rTableLines.Count(); ++n )
+	{
+		SwTableLine* pTableLine = rTableLines[ n ];
+		for( sal_uInt16 i = 0; i < pTableLine->GetTabBoxes().Count(); ++i )
+		{
+			SwTableBox* pTableBox = pTableLine->GetTabBoxes()[ i ];
+			if ( !pTableBox->GetTabLines().Count() )
+			{			
+				SwNodeIndex nodeIndex( *pTableBox->GetSttNd(), 1 );
+				SwNodeIndex endNodeIndex( *pTableBox->GetSttNd()->EndOfSectionNode() );
+				for( ; nodeIndex < endNodeIndex ; nodeIndex++ )
+				{				
+					if ( SwTableNode* pTableNode = nodeIndex.GetNode().GetTableNode() )
+						ConvertTableToText( pTableNode, cCh );
+				}
+			}
+			else
+			{
+				ConvertNestedTablesToText( pTableBox->GetTabLines(), cCh );
+			}
+		}
+	}
+}
+
+sal_Bool ConvertTableToText( const SwTableNode *pConstTableNode, sal_Unicode cCh )
+{
+	SwTableNode *pTableNode = const_cast< SwTableNode* >( pConstTableNode );
+	ConvertNestedTablesToText( pTableNode->GetTable().GetTabLines(), cCh );
+	return pTableNode->GetDoc()->TableToText( pTableNode, cCh );
+}
+//End for bug 119954
 const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts,
                                          sal_uInt16 nRows, sal_uInt16 nCols,
                                          sal_Int16 eAdj,
@@ -138,7 +174,11 @@ sal_Bool SwEditShell::TableToText( sal_U
 	pCrsr->SetMark();
 	pCrsr->DeleteMark();
 
-	bRet = GetDoc()->TableToText( pTblNd, cCh );
+	//Modified for bug 119954:Application crashed if undo/redo covert nest table to text
+	StartUndo();//UNDO_START
+	bRet = ConvertTableToText( pTblNd, cCh ); 
+	EndUndo();//UNDO_END
+	//End  for bug 119954
 	pCrsr->GetPoint()->nNode = aTabIdx;
 
 	SwCntntNode* pCNd = pCrsr->GetCntntNode();

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/colfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/colfrm.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/colfrm.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/colfrm.cxx Wed Jun 27 13:44:09 2012
@@ -371,7 +371,7 @@ void SwLayoutFrm::AdjustColumns( const S
     long nGutter = 0;
     // <--
 
-    for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i )
+    for ( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; ++i ) //i118878, value returned by GetNumCols() can't be trusted
 	{
         if( !bOrtho )
         {
@@ -448,7 +448,7 @@ void SwLayoutFrm::AdjustColumns( const S
     {
         long nInnerWidth = ( nAvail - nGutter ) / pAttr->GetNumCols();
         pCol = Lower();
-        for( sal_uInt16 i = 0; i < pAttr->GetNumCols(); pCol = pCol->GetNext(), ++i )
+        for( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; pCol = pCol->GetNext(), ++i ) //i118878, value returned by GetNumCols() can't be trusted
         {
             SwTwips nWidth;
             if ( i == pAttr->GetNumCols() - 1 )

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flowfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flowfrm.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flowfrm.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flowfrm.cxx Wed Jun 27 13:44:09 2012
@@ -1728,7 +1728,9 @@ SwTwips SwFlowFrm::GetUpperSpaceAmountCo
     {
         nUpperSpaceAmountConsideredForPrevFrmAndPageGrid =
             _GetUpperSpaceAmountConsideredForPrevFrm() +
-            _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0L, 0L, false ) );
+            ( rThis.GetUpper()->GetFmt()->GetDoc()->IsSquaredPageMode()
+              ? _GetUpperSpaceAmountConsideredForPageGrid( CalcUpperSpace( 0, 0, false ) )
+              : 0 );
     }
 
     return nUpperSpaceAmountConsideredForPrevFrmAndPageGrid;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx Wed Jun 27 13:44:09 2012
@@ -662,12 +662,15 @@ void SwPageFrm::AppendFlyToPage( SwFlyFr
     SdrObject* pObj = pNew->GetVirtDrawObj();
     ASSERT( pNew->GetAnchorFrm(), "Fly without Anchor" );
     const SwFlyFrm* pFly = pNew->GetAnchorFrm()->FindFlyFrm();
-	if ( pFly && pObj->GetNavigationPosition() < pFly->GetVirtDrawObj()->GetNavigationPosition() )
+
+    if ( pFly && pObj->GetNavigationPosition() < pFly->GetVirtDrawObj()->GetNavigationPosition() )
 	{
+        //#i119945# set pFly's OrdNum to _rNewObj's. So when pFly is removed by Undo, the original OrdNum will not be changed.
         sal_uInt32 nNewNum = pFly->GetVirtDrawObj()->GetNavigationPosition();
-		if ( pObj->getParentOfSdrObject() )
-	{
-			pObj->getParentOfSdrObject()->SetNavigationPosition( pObj->GetNavigationPosition(), nNewNum);
+
+        if ( pObj->getParentOfSdrObject() )
+    	{
+			pObj->getParentOfSdrObject()->SetNavigationPosition( pFly->GetVirtDrawObj()->GetNavigationPosition(), nNewNum);
 		}
 		else
 		{
@@ -676,7 +679,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFr
 			// which is not member of an SdrObjLsit by definition has an OrdNum of 0 since it
 			// is not member of a Z-Order (see SdrObject::GetNavigationPosition())
 			OSL_ENSURE(false, "SwPageFrm::AppendFlyToPage tried to set OrdNum for non-inserted SdrObject (!)");
-			// former code: pObj->SetOrdNum( nNewNum );
+			// former code: pFly->GetVirtDrawObj()->SetOrdNum( nNewNum );
 		}
 	}
 
@@ -947,16 +950,16 @@ void SwPageFrm::AppendDrawObjToPage( SwA
     }
 
     ASSERT( _rNewObj.GetAnchorFrm(), "anchored draw object without anchor" );
-    const SwFlyFrm* pFlyFrm = _rNewObj.GetAnchorFrm()->FindFlyFrm();
+    SwFlyFrm* pFlyFrm = (SwFlyFrm*)_rNewObj.GetAnchorFrm()->FindFlyFrm();
     if ( pFlyFrm &&
          _rNewObj.GetDrawObj()->GetNavigationPosition() < pFlyFrm->GetVirtDrawObj()->GetNavigationPosition() )
     {
+        //#i119945# set pFly's OrdNum to _rNewObj's. So when pFly is removed by Undo, the original OrdNum will not be changed.
         sal_uInt32 nNewNum = pFlyFrm->GetVirtDrawObj()->GetNavigationPosition();
 
 		if ( _rNewObj.GetDrawObj()->getParentOfSdrObject() )
-    {
-            _rNewObj.DrawObj()->getParentOfSdrObject()->SetNavigationPosition(
-				_rNewObj.GetDrawObj()->GetNavigationPosition(), nNewNum);
+        {
+            _rNewObj.DrawObj()->getParentOfSdrObject()->SetNavigationPosition(pFlyFrm->GetVirtDrawObj()->GetNavigationPosition(), nNewNum);
 		}
         else
 		{
@@ -965,7 +968,7 @@ void SwPageFrm::AppendDrawObjToPage( SwA
 			// which is not member of an SdrObjLsit by definition has an OrdNum of 0 since it
 			// is not member of a Z-Order (see SdrObject::GetNavigationPosition())
 			OSL_ENSURE(false, "SwPageFrm::AppendDrawObjToPage try to set OrdNum for non-inserted SdrObject (!)");
-            // former code: _rNewObj.DrawObj()->SetOrdNum( nNewNum );
+            // former code: pFlyFrm->GetVirtDrawObj()->SetOrdNum( nNewNum );
 		}
     }
 

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx Wed Jun 27 13:44:09 2012
@@ -2809,9 +2809,10 @@ void MA_FASTCALL lcl_Regist( SwPageFrm *
              pObj->GetDrawObj()->GetNavigationPosition() < pFly->GetVirtDrawObj()->GetNavigationPosition() &&
              pObj->GetDrawObj()->getSdrPageFromSdrObject() )
         {
+            //#i119945# set pFly's OrdNum to pObj's. So when pFly is removed by Undo, the original OrdNum will not be changed.
             pObj->DrawObj()->getSdrPageFromSdrObject()->SetNavigationPosition(
-                                pObj->GetDrawObj()->GetNavigationPosition(),
-                                pFly->GetVirtDrawObj()->GetNavigationPosition() + 1 );
+                                pFly->GetVirtDrawObj()->GetNavigationPosition(),
+                                pObj->GetDrawObj()->GetNavigationPosition() );
         }
 	}
 }

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/paintfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/paintfrm.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/paintfrm.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/paintfrm.cxx Wed Jun 27 13:44:09 2012
@@ -3530,6 +3530,20 @@ void MA_FASTCALL lcl_PaintLowerBorders( 
 
 void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
 {
+	//begin:optimize thumbnail generate and store procedure to improve odt saving performance, i120030
+	ViewShell *pShell = getRootFrm()->GetCurrShell();
+	if (pShell && pShell->GetDoc() && pShell->GetDoc()->GetDocShell())
+	{
+		sal_Bool bInGenerateThumbnail = pShell->GetDoc()->GetDocShell()->IsInGenerateAndStoreThumbnail();
+		if (bInGenerateThumbnail)
+		{
+			SwRect aVisRect = pShell->VisArea();
+			if (!aVisRect.IsOver(Frm()))
+				return;
+		}
+	}
+	//end:i120030
+
     //wegen der Ueberlappung von Rahmen und Zeichenobjekten muessen die
 	//Flys ihre Umrandung (und die der Innenliegenden) direkt ausgeben.
 	//z.B. #33066#

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/ole/ndole.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/ole/ndole.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/ole/ndole.cxx Wed Jun 27 13:44:09 2012
@@ -33,6 +33,7 @@
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>	// #i119941
 #include <cppuhelper/implbase1.hxx>
 
 #include <cppuhelper/implbase2.hxx>
@@ -357,8 +358,31 @@ sal_Bool SwOLENode::SavePersistentData()
 			if ( xChild.is() )
 				xChild->setParent( 0 );
 
-            pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
-
+          // pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
+           /* #i119941: When cut or move the chart, SwUndoFlyBase::DelFly will call SaveSection to store the comtent to strorage. 
+           In this step, chart filter functions will be called. And chart filter will call chart core functions to create the chart again. 
+           Then chart core function will call the class ExplicitCategoryProvider to create data source. 
+           In this step, when SW data source provider create the data source, it will create a new SwFlyFrm. 
+           But later in SwUndoFlyBase::DelFly, it will clear anchor related attributes of SwFlyFrm. Then finally null pointer occur.
+           Resolution:
+           In pCnt->RemoveEmbeddedObject in SaveSection process of table chart, only remove the object from the object container, 
+           without removing it's storage and graphic stream. The chart already removed from formatter.> */
+           sal_Bool	bChartWithInternalProvider = sal_False;
+           sal_Bool	bKeepObjectToTempStorage = sal_True;
+           uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
+           if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
+           {
+               uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
+               if ( xChart.is() && xChart->hasInternalDataProvider() )
+                   bChartWithInternalProvider = sal_True;
+           }            
+            
+           if ( IsChart() && sChartTblName.Len() && !bChartWithInternalProvider )
+               bKeepObjectToTempStorage = sal_False;
+           pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False, bKeepObjectToTempStorage );
+           // modify end            
+            
+            
 			// TODO/LATER: aOLEObj.aName has no meaning here, since the undo container contains the object
 			// by different name, in future it might makes sence that the name is transported here.
             aOLEObj.xOLERef.AssignToContainer( 0, aOLEObj.aName );

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unochart.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unochart.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unochart.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unochart.cxx Wed Jun 27 13:44:09 2012
@@ -1655,6 +1655,7 @@ sal_Bool SwChartDataProvider::DeleteBox(
         {
 			SwChartDataSequence *pDataSeq = 0;
             sal_Bool bNowEmpty = sal_False;
+            sal_Bool bSeqDisposed = sal_False;
 
             // check if weak reference is still valid...
 //            uno::Reference< chart2::data::XDataSequence > xRef( uno::Reference< chart2::data::XDataSequence>(*aIt), uno::UNO_QUERY );
@@ -1666,10 +1667,19 @@ sal_Bool SwChartDataProvider::DeleteBox(
                 pDataSeq = static_cast< SwChartDataSequence * >( xRef.get() );
                 if (pDataSeq)
                 {
+                    try
+                    {
 #if OSL_DEBUG_LEVEL > 1
                     OUString aRangeStr( pDataSeq->getSourceRangeRepresentation() );
 #endif
                     bNowEmpty = pDataSeq->DeleteBox( rBox );
+                    }
+                    catch (lang::DisposedException&)
+                    {
+                        bNowEmpty = sal_True;
+                        bSeqDisposed = sal_True;
+                    }
+					
                     if (bNowEmpty)
                         aDelIt = aIt;
                 }
@@ -1679,8 +1689,8 @@ sal_Bool SwChartDataProvider::DeleteBox(
             if (bNowEmpty)
 			{
                 rSet.erase( aDelIt );
-				if (pDataSeq)
-					pDataSeq->dispose();    // the current way to tell chart that sth. got removed
+                if (pDataSeq && !bSeqDisposed)
+                    pDataSeq->dispose();    // the current way to tell chart that sth. got removed
 			}
         }
     }
@@ -2590,6 +2600,20 @@ void SAL_CALL SwChartDataSequence::dispo
             else {
                 DBG_ERROR( "table missing" );
             }
+		
+		//Comment: The bug is crashed for an exception threw out in SwCharDataSequence::setModified(), just because
+		//the SwCharDataSequence object has been disposed. Actually, the former design of SwClient will disband 
+		//itself from the notification list in its destruction. But the SwCharDataSeqence wont be destructed but disposed
+		//in code (the data member SwChartDataSequence::bDisposed will be set to TRUE), the relationship between client
+		//and modification are not released. So any notification from modify object will lead said exception threw out.
+		//Recorrect the logic of code in SwChartDataSequence::Dispose(), release the relationship inside...
+		SwModify* pRegisteredIn = GetRegisteredInNonConst();
+		if (pRegisteredIn && pRegisteredIn->GetDepends())
+		{
+			pRegisteredIn->Remove(this);
+			pTblCrsr = NULL;
+		}
+		
         }
 
         // require listeners to release references to this object
@@ -2622,6 +2646,9 @@ void SAL_CALL SwChartDataSequence::remov
 
 sal_Bool SwChartDataSequence::DeleteBox( const SwTableBox &rBox )
 {
+	if (bDisposed)
+		throw lang::DisposedException();
+
 #if OSL_DEBUG_LEVEL > 1
 	String aBoxName( rBox.GetName() );
 #endif

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx Wed Jun 27 13:44:09 2012
@@ -103,6 +103,10 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/printer.hxx>
+//Begin Bug 119922
+#include <sfx2/docfile.hxx>
+#include <sfx2/docfilt.hxx>
+//End Bug 119922
 #include <SwStyleNameMapper.hxx>
 #include <xmloff/xmlcnitm.hxx>
 #include <poolfmt.hxx>
@@ -144,7 +148,13 @@ public:
 //    void          GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny );
 
 //    const SfxItemPropertyMap*       GetMap() const {return _pMap;}
-    sal_Bool                        FillBaseProperties(SfxItemSet& rToSet, const SfxItemSet &rFromSet, sal_Bool& rSizeFound);
+	//Begin Bug 119922:Graphic in header and footer can not be displayed correctly.
+	//Set default value for "Follow text flow" to false if a previous version didn't support "Follow text flow".
+	sal_Bool                        FillBaseProperties(SfxItemSet& rToSet,
+														const SfxItemSet &rFromSet, 
+														sal_Bool& rSizeFound, 
+														const sal_Bool bOasis = sal_False );
+	//End Bug 119922
 
     virtual sal_Bool                AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound) = 0;
 
@@ -164,7 +174,13 @@ sal_Bool BaseFrameProperties_Impl::GetPr
     return aAnyMap.FillValue( nWID, nMemberId, rpAny );
 }
 
-sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxItemSet& rFromSet, sal_Bool& rSizeFound)
+//Begin Bug 119922:Graphic in header and footer can not be displayed correctly.
+//Set default value for "Follow text flow" to false if a previous version didn't support "Follow text flow".
+sal_Bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet,
+													  const SfxItemSet& rFromSet, 
+													  sal_Bool& rSizeFound,
+													  const sal_Bool bOasis /*sal_False*/ )
+//End Bug 119922
 {
 	sal_Bool bRet = sal_True;
 	//Anker kommt auf jeden Fall in den Set
@@ -498,6 +514,10 @@ sal_Bool BaseFrameProperties_Impl::FillB
         aFmtFollowTextFlow.PutValue(*pFollowTextFlow, 0);
         rToSet.Put(aFmtFollowTextFlow);
     }
+    //Begin Bug 119922
+    else if ( bOasis )
+        rToSet.Put( SwFmtFollowTextFlow() );
+    //End Bug 119922
 
     // OD 2004-05-04 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
     const ::uno::Any* pWrapInfluenceOnObjPos = 0;
@@ -637,7 +657,15 @@ sal_Bool 	SwGraphicProperties_Impl::AnyT
 	{
 		rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet(*pStyle) );
         const :: SfxItemSet *pItemSet = &xStyle->GetItemSet();
-    	bRet = FillBaseProperties(rFrmSet, *pItemSet, rSizeFound);
+		//Begin Bug 119922
+    		sal_Bool bOasis = sal_False;
+		SfxMedium* pMedium = NULL;
+		const SfxFilter * pFilter = NULL;		
+		if ( ( pMedium = pDoc->GetDocShell()->GetMedium() ) &&
+				( pFilter = pMedium->GetFilter() ) )
+			bOasis = pFilter->GetVersion() > SOFFICE_FILEFORMAT_60;	
+		bRet = FillBaseProperties( rFrmSet, *pItemSet, rSizeFound, bOasis );
+		//End Bug 119922
 		lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
 	}
 	else

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unostyle.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unostyle.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unostyle.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unostyle.cxx Wed Jun 27 13:44:09 2012
@@ -860,17 +860,16 @@ uno::Sequence< OUString > SwXStyleFamily
     uno::Sequence< OUString > aRet;
     if(pBasePool)
     {
-        SfxStyleSheetIterator* pIterator = pBasePool->CreateIterator(eFamily, 0xffff);
-        sal_uInt16 nCount = pIterator->Count();
+        SfxStyleSheetIterator aIterator(pBasePool, eFamily, 0xffff);
+        sal_uInt16 nCount = aIterator.Count();
         aRet.realloc(nCount);
         OUString* pArray = aRet.getArray();
 		String aString;
         for(sal_uInt16 i = 0; i < nCount; i++)
 		{
-			SwStyleNameMapper::FillProgName((*pIterator)[i]->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+			SwStyleNameMapper::FillProgName(aIterator[i]->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
             pArray[i] = OUString ( aString );
 		}
-        delete pIterator;
     }
     else
         throw uno::RuntimeException();

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.cxx Wed Jun 27 13:44:09 2012
@@ -2731,9 +2731,10 @@ void WW8Export::WriteFkpPlcUsw()
             #10570# Similiarly having msvbasic storage seems to also trigger
             creating this stream
             */
-            GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool),
+                // memory leak #i120098#, the unnamed obj will be released in destructor.
+                xEscherStg = GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool),
                 STREAM_READWRITE | STREAM_SHARE_DENYALL);
-        }
+		}
 
         // dggInfo - escher stream
         WriteEscher();

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/wrtww8.hxx Wed Jun 27 13:44:09 2012
@@ -926,6 +926,9 @@ protected:
     SwWW8Writer        *m_pWriter;      ///< Pointer to the writer
     WW8AttributeOutput *m_pAttrOutput;  ///< Converting attributes to stream data
 
+private:
+	SvStorageRef       xEscherStg;      /// memory leak #i120098#, to hold the reference to unnamed SotStorage obj
+
 public:
     /// Access to the attribute output class.
     virtual AttributeOutputBase& AttrOutput() const;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx Wed Jun 27 13:44:09 2012
@@ -1704,7 +1704,11 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIn
         aLine.SetDistance(rBorders.mnDist);
 
         for(sal_uInt16 nLine = 0; nLine < 4; ++nLine)
-            rBox.SetLine(new SvxBorderLine( aLine ), nLine);
+		{
+			SvxBorderLine *pLine = new SvxBorderLine( aLine );
+			rBox.SetLine(pLine, nLine);
+			delete pLine;
+		}
     }
 
     return nOutsideThick;
@@ -2434,7 +2438,6 @@ RndStdIds SwWW8ImplReader::ProcessEscher
         if ( nInTable &&
              ( eHoriRel == text::RelOrientation::FRAME || eHoriRel == text::RelOrientation::CHAR ) &&
              pFSPA->nwr == 3 &&
-//             pRecord->nLayoutInTableCell == 0x80000000 )
              !IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell ) )
         {
             eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
@@ -2504,19 +2507,20 @@ bool SwWW8ImplReader::IsObjectLayoutInTa
             {
                 bIsObjectLayoutInTableCell = false;
                 ASSERT( nLayoutInTableCell == 0xFFFFFFFF,
-                        "no explicit object attribute layout in table cell excepted." );
+                        "no explicit object attribute layout in table cell expected." );
             }
             break;
             case 0x2000: // version 9 aka Microsoft Word 2000
             case 0x4000: // version 10 aka Microsoft Word 2002
             case 0x6000: // version 11 aka Microsoft Word 2003
             case 0x8000: // version 12 aka Microsoft Word 2007
+            case 0xC000: // version 14 aka Microsoft Word 2010
             {
                 // --> OD 2009-01-13 #i98037#
                 // adjustment of conditions needed after deeper analysis of
                 // certain test cases.
                 if ( nLayoutInTableCell == 0xFFFFFFFF || // no explicit attribute value given
-                     nLayoutInTableCell & 0x80008000 ||
+                     nLayoutInTableCell == 0x80008000 ||
                      ( nLayoutInTableCell & 0x02000000 &&
                        !(nLayoutInTableCell & 0x80000000 ) ) )
                 // <--

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par.cxx Wed Jun 27 13:44:09 2012
@@ -693,6 +693,8 @@ SdrObject* SwMSDffManager::ProcessObj(Sv
         if (SeekToContent(DFF_Prop_pWrapPolygonVertices, rSt))
         {
             delete pImpRec->pWrapPolygon;
+            pImpRec->pWrapPolygon = NULL;
+
             sal_uInt16 nNumElemVert, nNumElemMemVert, nElemSizeVert;
             rSt >> nNumElemVert >> nNumElemMemVert >> nElemSizeVert;
             if (nNumElemVert && ((nElemSizeVert == 8) || (nElemSizeVert == 4)))
@@ -2774,30 +2776,52 @@ bool SwWW8ImplReader::ReadChar(long nPos
             graphic preview of an associated ole2 object (or a simple
             graphic of course)
             */
-            if (!IsInlineEscherHack())
-            {
-                SwFrmFmt *pResult = 0;
-                if (bObj)
-                    pResult = ImportOle();
-                else if (bSpec)
-                    pResult = ImportGraf();
-
-                //#102160# If we have a bad 0x1 insert a space instead.
-                if (!pResult)
-                {
-                    cInsert = ' ';
-                    ASSERT(!bObj && !bEmbeddObj && !nObjLocFc,
-                        "WW8: Please report this document, it may have a "
-                        "missing graphic");
-                }
-                else
-                {
-                    // reset the flags.
-                    bObj = bEmbeddObj = false;
-                    nObjLocFc = 0;
-                }
-            }
-            break;
+			//normally in the canvas field, the code is 0x8 0x1.
+			//in a special case, the code is 0x1 0x1, which yields a simple picture
+			{
+				bool bReadObj = IsInlineEscherHack();
+				if( bReadObj )
+				{
+					long nCurPos = pStrm->Tell();
+					sal_uInt8   nByteCode;
+					sal_uInt16 nWordCode;
+
+					if( bIsUnicode )
+						*pStrm >> nWordCode;
+					else
+					{
+						*pStrm >> nByteCode;
+						nWordCode = nByteCode;
+					}
+					if( nWordCode == 0x1 )
+						bReadObj = false;
+					pStrm->Seek( nCurPos );	
+				}
+				if( !bReadObj )
+				{
+					SwFrmFmt *pResult = 0;
+					if (bObj)
+						pResult = ImportOle();
+					else if (bSpec)
+						pResult = ImportGraf();
+
+					//#102160# If we have a bad 0x1 insert a space instead.
+					if (!pResult)
+					{
+						cInsert = ' ';
+						ASSERT(!bObj && !bEmbeddObj && !nObjLocFc,
+							"WW8: Please report this document, it may have a "
+							"missing graphic");
+					}
+					else
+					{
+						// reset the flags.
+						bObj = bEmbeddObj = false;
+						nObjLocFc = 0;
+					}
+				}
+			}
+			break;
         case 0x8:
             if( !bObj )
                 Read_GrafLayer( nPosCp );

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8scan.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8scan.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8scan.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8scan.cxx Wed Jun 27 13:44:09 2012
@@ -6104,7 +6104,7 @@ WW8_STD* WW8Style::Read1STDFixed( short&
             if(10 > nRead ) break;
             rSt >> a16Bit;
             pStd->fAutoRedef =   a16Bit & 0x0001       ;
-            pStd->fHidden    = ( a16Bit & 0x0002 ) >> 2;
+            pStd->fHidden    = ( a16Bit & 0x0002 ) >> 1;
 
             // man kann nie wissen: vorsichtshalber ueberlesen
             // wir eventuelle Fuellsel, die noch zum BASE-Part gehoeren...

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlexpit.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlexpit.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlexpit.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlexpit.cxx Wed Jun 27 13:44:09 2012
@@ -1015,6 +1015,8 @@ sal_Bool SvXMLExportItemMapper::QueryXML
                                                       rUnitConverter );
                 if( bOk )
                     aOut.append( sValue );
+
+                delete pWritingModeHandler;  // memory leak #i120072#
             }
         }
         break;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlimpit.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlimpit.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlimpit.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/xml/xmlimpit.cxx Wed Jun 27 13:44:09 2012
@@ -944,6 +944,8 @@ sal_Bool SvXMLImportItemMapper::PutXMLVa
                                                       rUnitConverter );
                 if( bOk )
                     bOk = rItem.PutValue( aAny );
+
+                delete pWritingModeHandler;
             }
         }
         break;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/ui/app/docstyle.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/ui/app/docstyle.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/ui/app/docstyle.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/ui/app/docstyle.cxx Wed Jun 27 13:44:09 2012
@@ -2230,12 +2230,6 @@ void  SwDocStyleSheetPool::Replace( SfxS
 	}
 }
 
-SfxStyleSheetIterator*  SwDocStyleSheetPool::CreateIterator(
-                        SfxStyleFamily eFam, sal_uInt16 _nMask )
-{
-    return new SwStyleSheetIterator( this, eFam, _nMask );
-}
-
 void SwDocStyleSheetPool::dispose()
 {
 	mxStyleSheet.clear();

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/ui/uno/unotxvw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/ui/uno/unotxvw.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/ui/uno/unotxvw.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/ui/uno/unotxvw.cxx Wed Jun 27 13:44:09 2012
@@ -945,11 +945,22 @@ void SwXTextView::NotifySelChanged()
     DBG_ASSERT( m_pView, "view is missing" );
 
     // destroy temporary document with selected text that is used
-    // in PDF export of (multi-)selections.
+    // in PDF export of (multi-)selections and on print of (multi-)selections
     if (m_pView && m_pView->GetTmpSelectionDoc().Is())
     {
-        m_pView->GetTmpSelectionDoc()->DoClose();
-        m_pView->GetTmpSelectionDoc() = 0;
+        // do not destroy the temporary document, if an action is pending
+        bool bActionPending = false;
+        {
+            SfxObjectShellLock& xDocSh = m_pView->GetTmpSelectionDoc();
+            SwDoc* pDoc = static_cast< SwDocShell* >(&xDocSh)->GetDoc();
+            SwView* pView = pDoc ? pDoc->GetDocShell()->GetView() : 0;
+            bActionPending = pView ? pView->GetWrtShell().ActionPend() : false;
+        }
+        if ( !bActionPending )
+        {
+            m_pView->GetTmpSelectionDoc()->DoClose();
+            m_pView->GetTmpSelectionDoc() = 0;
+        }
     }
 
 	uno::Reference< uno::XInterface >  xInt = (cppu::OWeakObject*)(SfxBaseController*)this;

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,15 +21,15 @@
  * 
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:21181"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79" statusbar:helpid="helpid:21182"/>
- <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatePageNumber" statusbar:align="left" statusbar:autosize="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:PageStyleName" statusbar:align="left" statusbar:autosize="true" statusbar:width="79"/>
+ <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100"/>
+ <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37"/>
+ <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129"/>
+ <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63"/>
+ <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130"/>
+ <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35"/>
 </statusbar:statusbar>

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/alignmentbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/alignmentbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/alignmentbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/alignmentbar.xml Wed Jun 27 13:44:09 2012
@@ -23,11 +23,11 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131"  />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132"  />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133"  />
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134"  />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135"  />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136"  />
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/arrowshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/arrowshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/arrowshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/arrowshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,34 +23,34 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/basicshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/basicshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/basicshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/basicshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,29 +23,29 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> 
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> 
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/bezierobjectbar.xml Wed Jun 27 13:44:09 2012
@@ -23,20 +23,20 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode" toolbar:helpid="helpid:10126" />
+ <toolbar:toolbaritem xlink:href=".uno:ToggleObjectBezierMode"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:helpid="helpid:10121"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:helpid="helpid:10119"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:BezierMove" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierInsert" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierDelete" toolbar:helpid="helpid:10120" />
- <toolbar:toolbaritem xlink:href=".uno:BezierCutLine" toolbar:helpid="helpid:10127" />
- <toolbar:toolbaritem xlink:href=".uno:BezierConvert" toolbar:helpid="helpid:27065" />
+ <toolbar:toolbaritem xlink:href=".uno:BezierDelete"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierCutLine"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierConvert"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:helpid="helpid:27066" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:helpid="helpid:10123" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:helpid="helpid:27067" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:BezierEdge" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierSmooth" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:BezierSymmetric" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierClose" toolbar:helpid="helpid:10122" />
+ <toolbar:toolbaritem xlink:href=".uno:BezierClose"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints" toolbar:helpid="helpid:27030" />
+ <toolbar:toolbaritem xlink:href=".uno:BezierEliminatePoints"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/calloutshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/calloutshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/calloutshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/calloutshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,11 +23,11 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" toolbar:helpid="helpid:11006" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" toolbar:helpid="helpid:11006" />
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/colorbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/colorbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/colorbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/uiconfig/sglobal/toolbar/colorbar.xml Wed Jun 27 13:44:09 2012
@@ -23,15 +23,15 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:GrafRed" toolbar:helpid="helpid:10865" />
+ <toolbar:toolbaritem xlink:href=".uno:GrafRed"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGreen" toolbar:helpid="helpid:10866" />
+ <toolbar:toolbaritem xlink:href=".uno:GrafGreen"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafBlue" toolbar:helpid="helpid:10867" />
+ <toolbar:toolbaritem xlink:href=".uno:GrafBlue"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafLuminance" toolbar:helpid="helpid:10863" />
+ <toolbar:toolbaritem xlink:href=".uno:GrafLuminance"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafContrast" toolbar:helpid="helpid:10864" />
+ <toolbar:toolbaritem xlink:href=".uno:GrafContrast"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GrafGamma" toolbar:helpid="helpid:10868" />
+ <toolbar:toolbaritem xlink:href=".uno:GrafGamma"/>
 </toolbar:toolbar>



Mime
View raw message