diff options
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 3939b8667e95..7e920d7642e6 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2392,7 +2392,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) ::SetProgressState(m_nProgress, m_pDocShell); // Update m_nDrawCpO = 0; - m_pWwFib->GetBaseCp(m_pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX, &m_nDrawCpO); //TODO: check return value + m_bDrawCpOValid = m_pWwFib->GetBaseCp(m_pPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT : MAN_TXBX, &m_nDrawCpO); GrafikCtor(); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 11a32469237d..d7eadb12f8ad 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4182,6 +4182,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage, , m_nIniFlags1(0) , m_nFieldFlags(0) , m_bRegardHindiDigits( false ) + , m_bDrawCpOValid( false ) , m_nDrawCpO(0) , m_nPicLocFc(0) , m_nObjLocFc(0) @@ -6222,7 +6223,7 @@ bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName, // Note: Ask MM for initialization of <nStartCp> and <nEndCp>. // Note: Ask MM about assertions in method <rReader.GetTxbxTextSttEndCp(..)>. WW8_CP nStartCp, nEndCp; - if ( rReader.GetTxbxTextSttEndCp(nStartCp, nEndCp, + if ( rReader.m_bDrawCpOValid && rReader.GetTxbxTextSttEndCp(nStartCp, nEndCp, static_cast<sal_uInt16>((nOLEId >> 16) & 0xFFFF), static_cast<sal_uInt16>(nOLEId & 0xFFFF)) ) { diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index b13230d6d69b..400e3cc96cea 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1264,6 +1264,7 @@ private: sal_uInt32 m_nFieldTagBad[3]; // dito for tagging of fields that can't be imported bool m_bRegardHindiDigits; // import digits in CTL scripts as Hindi numbers + bool m_bDrawCpOValid; WW8_CP m_nDrawCpO; // start of Txbx-SubDocs sal_uLong m_nPicLocFc; // Picture Location in File (FC) |