diff options
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8gr.cxx | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index c1dc4de3791b..9fdf61a63028 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1008,7 +1008,6 @@ public: SvxMSExportOLEObjects& GetOLEExp() { return *m_pOLEExp; } SwMSConvertControls& GetOCXExp() { return *m_pOCXExp; } - WW8OleMap& GetOLEMap() { return m_aOleMap; } void ExportDopTypography(WW8DopTypography &rTypo); sal_uInt16 AddRedlineAuthor( sal_uInt16 nId ); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 6f00814e47b5..8834934c115c 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -218,14 +218,13 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) if( xObj.is() ) { const embed::XEmbeddedObject *pObj = xObj.get(); - WW8OleMap& rPointerToObjId = GetOLEMap(); //Don't want to use pointer ids, as is traditional, because we need //to put this into a 32bit value, and on 64bit the bottom bits //might collide and two unrelated ole objects end up considered the //same. Don't want to simply start at 0 which is a special value - sal_Int32 nPictureId = SAL_MAX_INT32 - rPointerToObjId.size(); + sal_Int32 nPictureId = SAL_MAX_INT32 - m_aOleMap.size(); WW8OleMap::value_type entry = std::make_pair(pObj, nPictureId); - std::pair<WW8OleMap::iterator, bool> aRes = rPointerToObjId.insert(entry); + std::pair<WW8OleMap::iterator, bool> aRes = m_aOleMap.insert(entry); bool bIsNotDuplicate = aRes.second; //.second is false when element already existed nPictureId = aRes.first->second; Set_UInt32(pDataAdr, nPictureId); |