diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-12 23:42:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-12 23:48:14 +0200 |
| commit | 50ce1874041c8ccfb5c9fefa8a66abb48fa26dcc (patch) | |
| tree | a060fa15f3641954624d65fda1515e2069a759b1 /sw | |
| parent | 3d3b3f656f92790225b89aa31ee61163fb2fc7e5 (diff) | |
SwWW8ImplReader::Read_GrafLayer: appease MSVC:
MSVC 2008 refuses to compile this unless it gets a const_iterator, and i
have no idea why.
Change-Id: I08a6916313ae256388309742604dfb5940b42b9f
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 60c3357696b3..7a87b29b1814 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2561,12 +2561,12 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) Get the record for top level object, so we can get the word anchoring and wrapping information for it. */ - for (MSDffImportRecords::iterator it = aData.begin(); - it != aData.end(); ++it) + for (MSDffImportRecords::const_iterator it = aData.begin(); + it != aData.end(); ++it) // MSVC2008 wants const_iterator here??? { if (it->pObj == pObject) { - pRecord = &*it; + pRecord = &const_cast<SvxMSDffImportRec&>(*it); break; } } @@ -2663,10 +2663,10 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) */ if (!aData.empty()) { - for (MSDffImportRecords::iterator it = aData.begin(); + for (MSDffImportRecords::const_iterator it = aData.begin(); it != aData.end(); ++it) { - pRecord = &*it; + pRecord = &const_cast<SvxMSDffImportRec&>(*it); if (pRecord->pObj && pRecord->aTextId.nTxBxS) { // #i52825# pRetFrmFmt can be NULL pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj, |