activitiesqueue.cxx (70f497fb) | activitiesqueue.cxx (56b8eddc) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 118 unchanged lines hidden (view full) --- 127 catch( uno::Exception& ) 128 { 129 // catch anything here, we don't want 130 // to leave this scope under _any_ 131 // circumstance. Although, do _not_ 132 // reinsert an activity that threw 133 // once. 134 | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 118 unchanged lines hidden (view full) --- 127 catch( uno::Exception& ) 128 { 129 // catch anything here, we don't want 130 // to leave this scope under _any_ 131 // circumstance. Although, do _not_ 132 // reinsert an activity that threw 133 // once. 134 |
135 // NOTE: we explicitely don't catch(...) here, | 135 // NOTE: we explicitly don't catch(...) here, |
136 // since this will also capture segmentation 137 // violations and the like. In such a case, we 138 // still better let our clients now... 139 OSL_ENSURE( false, 140 rtl::OUStringToOString( 141 comphelper::anyToString( cppu::getCaughtException() ), 142 RTL_TEXTENCODING_UTF8 ).getStr() ); 143 } 144 catch( SlideShowException& ) 145 { 146 // catch anything here, we don't want 147 // to leave this scope under _any_ 148 // circumstance. Although, do _not_ 149 // reinsert an activity that threw 150 // once. 151 | 136 // since this will also capture segmentation 137 // violations and the like. In such a case, we 138 // still better let our clients now... 139 OSL_ENSURE( false, 140 rtl::OUStringToOString( 141 comphelper::anyToString( cppu::getCaughtException() ), 142 RTL_TEXTENCODING_UTF8 ).getStr() ); 143 } 144 catch( SlideShowException& ) 145 { 146 // catch anything here, we don't want 147 // to leave this scope under _any_ 148 // circumstance. Although, do _not_ 149 // reinsert an activity that threw 150 // once. 151 |
152 // NOTE: we explicitely don't catch(...) here, | 152 // NOTE: we explicitly don't catch(...) here, |
153 // since this will also capture segmentation 154 // violations and the like. In such a case, we 155 // still better let our clients now... 156 OSL_TRACE( "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" ); 157 } 158 159 if( bReinsert ) 160 maCurrentActivitiesReinsert.push_back( pActivity ); --- 46 unchanged lines hidden --- | 153 // since this will also capture segmentation 154 // violations and the like. In such a case, we 155 // still better let our clients now... 156 OSL_TRACE( "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" ); 157 } 158 159 if( bReinsert ) 160 maCurrentActivitiesReinsert.push_back( pActivity ); --- 46 unchanged lines hidden --- |