diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-08-02 07:59:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-02 10:27:34 +0200 |
| commit | 6f1b6f6527b06b15aa29ccfd7089a9fb382d42d7 (patch) | |
| tree | 0eaa6ee3c3c78ec3aec3955c222c81a134757ac9 /sw | |
| parent | 4f950ffb896ce3fb8af6f422a53ea132bc055e1c (diff) | |
Resolves: #i122885# handle SmartTag related exceptions gracefully
and support diagnostics by providing exception details
(cherry picked from commit 7334341e5986b7685866a836195fd6d189293cab)
Conflicts:
sw/source/core/layout/layact.cxx
Change-Id: I18f4ddafd48f53329d313ada5fe1624974a61894
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 71659ce4ab95..cc14c74f91ad 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2088,12 +2088,17 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob ) } case SMART_TAGS : // SMARTTAGS { - const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan( pCntntNode, nTxtPos ) ); - bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty(); - if( !bPageValid ) - bAllValid = sal_False; - if ( aRepaint.HasArea() ) - pImp->GetShell()->InvalidateWindows( aRepaint ); + try { + const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan( pCntntNode, nTxtPos ) ); + bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty(); + if( !bPageValid ) + bAllValid = sal_False; + if ( aRepaint.HasArea() ) + pImp->GetShell()->InvalidateWindows( aRepaint ); + } catch( const ::com::sun::star::uno::RuntimeException& e) { + // #i122885# handle smarttag problems gracefully and provide diagnostics + SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message); + } if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) ) return sal_True; break; |