diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-10 16:14:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-10 16:37:13 +0000 |
| commit | e634cd9f4f681bcf8401576b5d4ee4ca8fb2eec5 (patch) | |
| tree | 49646fac2fbb1194de88a97ff622af258f1043cf /sw/source | |
| parent | 4e4554f1a674da89f752fe07d557b759b69cf2c9 (diff) | |
crashtesting: fix assert on re-export of ooo74510-1.odt to docx
Change-Id: Id66ab14772b002b140ba6bbfd098c19aeb1a537f
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/ole/ndole.cxx | 11 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 11 |
2 files changed, 15 insertions, 7 deletions
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index b9049d7f9cbd..99b3f777fa9d 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -192,7 +192,7 @@ SwEmbedObjectLink::~SwEmbedObjectLink() xObject->changeState( nState ); } } - catch ( uno::Exception& ) + catch (const uno::Exception&) { } } @@ -357,7 +357,7 @@ bool SwOLENode::SavePersistentData() // "unload" object aOLEObj.xOLERef->changeState( embed::EmbedStates::LOADED ); } - catch ( uno::Exception& ) + catch (const uno::Exception&) { } } @@ -549,8 +549,9 @@ bool SwOLENode::UpdateLinkURL_Impl() if ( nCurState != embed::EmbedStates::LOADED ) xObj->changeState( nCurState ); } - catch( uno::Exception& ) - {} + catch (const uno::Exception&) + { + } } if ( !bResult ) @@ -873,7 +874,7 @@ bool SwOLEObj::UnloadObject( uno::Reference< embed::XEmbeddedObject > xObj, cons // setting object to loaded state will remove it from cache xObj->changeState( embed::EmbedStates::LOADED ); } - catch ( uno::Exception& ) + catch (const uno::Exception&) { bRet = false; } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7958bf7eb315..e8b505504532 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4522,8 +4522,15 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath) { uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode*>(pPostponedMath)->GetOLEObj().GetOleRef()); if (embed::EmbedStates::LOADED == xObj->getCurrentState()) - { // must be running so there is a Component - xObj->changeState(embed::EmbedStates::RUNNING); + { + // must be running so there is a Component + try + { + xObj->changeState(embed::EmbedStates::RUNNING); + } + catch (const uno::Exception&) + { + } } uno::Reference< uno::XInterface > xInterface( xObj->getComponent(), uno::UNO_QUERY ); if (!xInterface.is()) |