You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/08/13 16:37:47 UTC
svn commit: r1513510 - in /openoffice/branches/AOO401: ./ main/cui/
main/drawinglayer/ main/sw/source/core/layout/layact.cxx
main/vcl/unx/gtk/window/gtkframe.cxx test/
test/testcommon/source/org/openoffice/test/vcl/
Author: hdu
Date: Tue Aug 13 14:37:46 2013
New Revision: 1513510
URL: http://svn.apache.org/r1513510
Log:
#i122885# handle SmartTag related exceptions gracefully
and support diagnostics by providing exception details to DBG_WARNING
Modified:
openoffice/branches/AOO401/ (props changed)
openoffice/branches/AOO401/main/cui/ (props changed)
openoffice/branches/AOO401/main/drawinglayer/ (props changed)
openoffice/branches/AOO401/main/sw/source/core/layout/layact.cxx
openoffice/branches/AOO401/main/vcl/unx/gtk/window/gtkframe.cxx (props changed)
openoffice/branches/AOO401/test/ (props changed)
openoffice/branches/AOO401/test/testcommon/source/org/openoffice/test/vcl/ (props changed)
Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1509576,1510489
Propchange: openoffice/branches/AOO401/main/cui/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/cui:r1509576,1510489
Propchange: openoffice/branches/AOO401/main/drawinglayer/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/drawinglayer:r1509576,1510489
Modified: openoffice/branches/AOO401/main/sw/source/core/layout/layact.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/sw/source/core/layout/layact.cxx?rev=1513510&r1=1513509&r2=1513510&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/sw/source/core/layout/layact.cxx (original)
+++ openoffice/branches/AOO401/main/sw/source/core/layout/layact.cxx Tue Aug 13 14:37:46 2013
@@ -2218,12 +2218,17 @@ sal_Bool SwLayIdle::_DoIdleJob( const Sw
}
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
+ DBG_WARNING( rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ }
if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD|INPUT_OTHER|INPUT_PAINT ) )
return sal_True;
break;
Propchange: openoffice/branches/AOO401/main/vcl/unx/gtk/window/gtkframe.cxx
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx:r1509576,1510489
Propchange: openoffice/branches/AOO401/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1509576,1510489
Propchange: openoffice/branches/AOO401/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1509576,1510489