diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-28 00:35:14 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-28 00:48:22 +0200 |
| commit | ce66ded6fe2a291301c8e075be67347211d4309d (patch) | |
| tree | 573477a0d310ea844bc066bc041a9ddbf8ae3fe0 /sw | |
| parent | 8a05f1265e6307c34b2ffdb5fc5279870c8397b7 (diff) | |
fix STL conversion 3ae618f9e4c34d5f6f10d953e3fb074018001748:
It turns out that this SvxMSDffShapeInfos has some, shall we say,
non-obvious properties, including a split personality that changes
its nature from checking for pointer equality to not doing so;
symptoms of this include a failing sw_subsequent_ww8export test.
Try to cure this madness by splitting the personalities into distinct
types, a set and a multiset.
Change-Id: Ib87368564b8e1f61379703034c0965422c6dcd0e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1512cc0108f4..505369cc7fd3 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -591,11 +591,12 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, // das Objekt durch einen Rahmen ersetzen, ansonsten if( bIsSimpleDrawingTextBox ) { - SvxMSDffShapeInfo aTmpRec( 0, pImpRec->nShapeId ); - aTmpRec.bSortByShapeId = sal_True; + ::boost::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( + new SvxMSDffShapeInfo(0, pImpRec->nShapeId)); - SvxMSDffShapeInfos::const_iterator it = GetShapeInfos()->find( &aTmpRec ); - if( it != GetShapeInfos()->end() ) + SvxMSDffShapeInfos_ById::const_iterator const it = + GetShapeInfos()->find(pTmpRec); + if (it != GetShapeInfos()->end()) { SvxMSDffShapeInfo& rInfo = **it; pImpRec->bReplaceByFly = rInfo.bReplaceByFly; |