diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-21 18:12:16 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-21 18:12:16 -0500 |
| commit | 0d4720d1e1ffcefc43ae2af59c7487ab0bfab2ce (patch) | |
| tree | 7cacea747b7ff3de52f69a8605ef486463201a9c /cui/source/options/optgdlg.cxx | |
| parent | 57b992c0b57daba5f44b5c4cdb08e817f355ea01 (diff) | |
undo anything not wizard related in the previous merge-commit
Diffstat (limited to 'cui/source/options/optgdlg.cxx')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 03f35d6d1111..503e4bb7778e 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -180,9 +180,12 @@ namespace if ( xEnum.is() && xEnum->hasMoreElements() ) bRet = sal_True; } - - catch( IllegalArgumentException ) {} - catch( ElementExistException ) {} + catch (const IllegalArgumentException&) + { + } + catch (const ElementExistException&) + { + } return bRet; } } @@ -639,7 +642,7 @@ CanvasSettings::CanvasSettings() : ++pCurr; } } - catch( Exception& ) + catch (const Exception&) { } } @@ -677,8 +680,9 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const return mbHWAccelAvailable; } } - catch (Exception &) - {} + catch (const Exception&) + { + } ++pCurrImpl; } @@ -1339,7 +1343,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe } } - catch (Exception &e) + catch (const Exception &e) { // we'll just leave the box in it's default setting and won't // even give it event handler... @@ -1522,7 +1526,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) } } } - catch (Exception& e) + catch (const Exception& e) { // we'll just leave the box in it's default setting and won't // even give it event handler... @@ -1757,7 +1761,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) aCTLLang >>= aLocale; eCurLangCTL = MsLangId::convertLocaleToLanguage( aLocale ); } - catch(Exception&) + catch (const Exception&) { } //overwrite them by the values provided by the DocShell |