Author: hdu
Date: Fri Nov 30 13:31:14 2012
New Revision: 1415625
URL: http://svn.apache.org/viewvc?rev=1415625&view=rev
Log:
#i120927# limit scope of case-specific pSdrObj
Modified:
openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx?rev=1415625&r1=1415624&r2=1415625&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx Fri Nov 30 13:31:14
2012
@@ -2282,37 +2282,38 @@ SwEscherEx::SwEscherEx(SvStream* pStrm,
case sw::Frame::eFormControl:
WriteOCXControl(rFmt, nShapeId = GenerateShapeId());
break;
- case sw::Frame::eDrawing:
- aWinwordAnchoring.SetAnchoring(rFmt);
- const SdrObject* pSdrObj =
rFmt.FindRealSdrObject();
- if (pSdrObj)
- {
- bool bSwapInPage = false;
- if (!pSdrObj->GetPage())
+ case sw::Frame::eDrawing: {
+ aWinwordAnchoring.SetAnchoring(rFmt);
+ const SdrObject* pSdrObj = rFmt.FindRealSdrObject();
+ if (pSdrObj)
{
- if (SdrModel* pModel = rWrt.pDoc->GetDrawModel())
+ bool bSwapInPage = false;
+ if (!pSdrObj->GetPage())
{
- if (SdrPage *pPage = pModel->GetPage(0))
+ if (SdrModel* pModel =
rWrt.pDoc->GetDrawModel())
{
- bSwapInPage = true;
-
(const_cast<SdrObject*>(pSdrObj))->SetPage(pPage);
+ if (SdrPage *pPage = pModel->GetPage(0))
+ {
+ bSwapInPage = true;
+
(const_cast<SdrObject*>(pSdrObj))->SetPage(pPage);
+ }
}
}
- }
- nShapeId = AddSdrObject(*pSdrObj);
+ nShapeId = AddSdrObject(*pSdrObj);
- if (bSwapInPage)
- (const_cast<SdrObject*>(pSdrObj))->SetPage(0);
- }
+ if (bSwapInPage)
+ (const_cast<SdrObject*>(pSdrObj))->SetPage(0);
+ }
#ifdef DBG_UTIL
- else
- ASSERT( !this, "Where is the SDR-Object?" );
+ else
+ ASSERT( !this, "Where is the SDR-Object?" );
#endif
- break;
- default:
- break;
- }
+ }
+ break;
+ default:
+ break;
+ }
if( !nShapeId )
{
