[Libreoffice-commits] core.git: connectivity/source dbaccess/source editeng/source extensions/source filter/source forms/source framework/source include/desktop qadevOOo/tests reportdesign/source sal/osl sd/source svx/source sw/source ucb/source udkapi/com unotools/source xmlhelp/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Jun 26 07:00:00 UTC 2017
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 2 -
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 2 -
dbaccess/source/filter/xml/xmlQuery.cxx | 2 -
dbaccess/source/filter/xml/xmlTable.cxx | 4 +-
dbaccess/source/filter/xml/xmlfilter.cxx | 2 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 4 +-
editeng/source/uno/unotext2.cxx | 2 -
extensions/source/bibliography/datman.cxx | 2 -
extensions/source/bibliography/framectr.cxx | 2 -
filter/source/config/cache/filterfactory.cxx | 2 -
filter/source/msfilter/escherex.cxx | 2 -
filter/source/xsltdialog/typedetectionexport.cxx | 6 +--
filter/source/xsltdialog/typedetectionimport.cxx | 2 -
filter/source/xsltdialog/xmlfilterjar.cxx | 6 +--
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 24 ++++++------
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 4 +-
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 12 +++---
forms/source/component/DatabaseForm.hxx | 2 -
framework/source/inc/pattern/frame.hxx | 2 -
include/desktop/exithelper.h | 2 -
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 2 -
qadevOOo/tests/java/ifc/frame/_XModuleManager.java | 2 -
reportdesign/source/core/sdr/PropertyForward.cxx | 2 -
reportdesign/source/filter/xml/xmlCell.cxx | 2 -
reportdesign/source/filter/xml/xmlComponent.cxx | 2 -
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 2 -
reportdesign/source/filter/xml/xmlFormatCondition.cxx | 2 -
reportdesign/source/filter/xml/xmlFormattedField.cxx | 2 -
reportdesign/source/filter/xml/xmlFunction.cxx | 4 +-
reportdesign/source/filter/xml/xmlGroup.cxx | 4 +-
reportdesign/source/filter/xml/xmlHelper.cxx | 2 -
reportdesign/source/filter/xml/xmlImage.cxx | 2 -
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2 -
reportdesign/source/filter/xml/xmlReport.cxx | 2 -
reportdesign/source/filter/xml/xmlReportElement.cxx | 2 -
reportdesign/source/filter/xml/xmlSection.cxx | 2 -
reportdesign/source/filter/xml/xmlTable.cxx | 4 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 -
reportdesign/source/ui/misc/RptUndo.cxx | 4 +-
reportdesign/source/ui/report/ReportSection.cxx | 2 -
sal/osl/unx/process.cxx | 2 -
sd/source/ui/app/sdxfer.cxx | 2 -
sd/source/ui/unoidl/unocpres.cxx | 2 -
svx/source/form/fmsrcimp.cxx | 6 +--
svx/source/form/navigatortree.cxx | 2 -
sw/source/filter/ww8/docxexport.cxx | 4 +-
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 2 -
udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl | 6 +--
unotools/source/config/viewoptions.cxx | 2 -
xmlhelp/source/cxxhelp/test/searchdemo.cxx | 2 -
50 files changed, 82 insertions(+), 82 deletions(-)
New commits:
commit 3f3181522bd5fa7cd32dc81c624ef260b29cfc9c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jun 23 12:47:20 2017 +0200
s/catched/caught
Change-Id: I7ea6977a9749e86f8058b78cdb91cd2c62da8264
Reviewed-on: https://gerrit.libreoffice.org/39164
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 56a1fc67c62b..0ac0f7f39d51 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -396,7 +396,7 @@ void Container::fire( const EventBroadcastHelper &helper )
}
catch ( css::uno::RuntimeException & )
{
- OSL_ENSURE( false, "exception catched" );
+ OSL_ENSURE( false, "exception caught" );
// loose coupling, a runtime exception shall not break anything
// TODO: log away as warning !
}
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index d6376850c87c..44197f555ed4 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -93,7 +93,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
}
catch(Exception&)
{
- OSL_FAIL("OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched");
+ OSL_FAIL("OXMLHierarchyCollection::OXMLHierarchyCollection -> exception caught");
}
}
}
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index b86362c6fc5e..d37fd226947a 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -129,7 +129,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp )
}
catch(Exception&)
{
- OSL_FAIL("OXMLTable::EndElement -> exception catched");
+ OSL_FAIL("OXMLTable::EndElement -> exception caught");
}
}
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 0e129c41751f..2450c8b9c875 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -172,7 +172,7 @@ void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp )
}
catch(Exception&)
{
- OSL_FAIL("OXMLTable::EndElement -> exception catched");
+ OSL_FAIL("OXMLTable::EndElement -> exception caught");
}
}
@@ -205,7 +205,7 @@ void OXMLTable::EndElement()
}
catch(Exception&)
{
- OSL_FAIL("OXMLQuery::EndElement -> exception catched");
+ OSL_FAIL("OXMLQuery::EndElement -> exception caught");
}
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index b5477eeae235..41973b5efd6c 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -112,7 +112,7 @@ ErrCode ReadThroughComponent(
catch (const SAXParseException& r)
{
#if OSL_DEBUG_LEVEL > 0
- SAL_WARN("dbaccess", "SAX parse exception catched while importing: " << r.Message << r.LineNumber << "," << r.ColumnNumber);
+ SAL_WARN("dbaccess", "SAX parse exception caught while importing: " << r.Message << r.LineNumber << "," << r.ColumnNumber);
#else
(void)r;
#endif
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 558614f6fc34..78c79ccb2a55 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2734,7 +2734,7 @@ namespace accessibility
}
catch (const lang::IndexOutOfBoundsException&)
{
- // this one needs to be catched since this interface does not allow for it.
+ // this one needs to be caught since this interface does not allow for it.
}
return aResult;
}
@@ -2750,7 +2750,7 @@ namespace accessibility
}
catch (const lang::IndexOutOfBoundsException&)
{
- // this one needs to be catched since this interface does not allow for it.
+ // this one needs to be caught since this interface does not allow for it.
}
return nRes;
}
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 93e746ae378f..5f012775bfde 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -224,7 +224,7 @@ void SAL_CALL SvxUnoTextContent::dispose()
SolarMutexGuard aGuard;
if( mbDisposing )
- return; // catched a recursion
+ return; // caught a recursion
mbDisposing = true;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 9f7d29c84fd9..5c520b5d0c7c 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -179,7 +179,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm)
}
catch (const Exception& e)
{
- SAL_WARN( "extensions.biblio", "::getColumns : catched an exception. " << e.Message);
+ SAL_WARN( "extensions.biblio", "::getColumns : caught an exception. " << e.Message);
}
}
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 51d661e37731..5e786a87e00e 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -417,7 +417,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
catch(const Exception&)
{
- OSL_FAIL("Exception catched while changing the data source");
+ OSL_FAIL("Exception caught while changing the data source");
}
}
}
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index c5b180fa698a..be8750797f94 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -530,7 +530,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString&
try
{
css::uno::Reference< css::container::XNameAccess > xUISortConfig = officecfg::TypeDetection::UISort::ModuleDependendFilterOrder::get(xContext);
- // don't check the module name here. If it does not exists, an exception is thrown and catched below.
+ // don't check the module name here. If it does not exists, an exception is thrown and caught below.
// We return an empty list as result then.
css::uno::Reference< css::container::XNameAccess > xModule;
xUISortConfig->getByName(sModule) >>= xModule;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 870e94373149..bf0450fe513b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2474,7 +2474,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape,
catch ( ... )
{
EnhancedCustomShapeEquation aEquation; // #i112309# EnhancedCustomShape::Parse error
- aEquation.nOperation = 0; // not catched on linux platform
+ aEquation.nOperation = 0; // not caught on linux platform
aEquation.nPara[ 0 ] = 1;
rEquations.push_back( aEquation );
}
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 53446dad77bf..386f47509dcb 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -214,7 +214,7 @@ void TypeDetectionExporter::doExport( const Reference< XOutputStream >& xOS, co
}
catch( const Exception& )
{
- OSL_FAIL( "TypeDetectionExporter::doExport exception catched!" );
+ OSL_FAIL( "TypeDetectionExporter::doExport exception caught!" );
}
}
@@ -244,7 +244,7 @@ void TypeDetectionExporter::addProperty( const Reference< XWriter >& xHandler, c
}
catch( const Exception& )
{
- OSL_FAIL( "TypeDetectionExporter::addProperty exception catched!" );
+ OSL_FAIL( "TypeDetectionExporter::addProperty exception caught!" );
}
}
@@ -275,7 +275,7 @@ void TypeDetectionExporter::addLocaleProperty( const Reference< XWriter >& xHand
}
catch( const Exception& )
{
- OSL_FAIL( "TypeDetectionExporter::addLocaleProperty exception catched!" );
+ OSL_FAIL( "TypeDetectionExporter::addLocaleProperty exception caught!" );
}
}
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index c9eee6cb012a..4cdd05cc9b91 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -62,7 +62,7 @@ void TypeDetectionImporter::doImport( const Reference< XComponentContext >& rxCo
}
catch( const Exception& /* e */ )
{
- OSL_FAIL( "TypeDetectionImporter::doImport exception catched!" );
+ OSL_FAIL( "TypeDetectionImporter::doImport exception caught!" );
}
}
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 84ca45e96aef..c9aec0b31584 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -224,7 +224,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterJarHelper::savePackage exception catched!" );
+ OSL_FAIL( "XMLFilterJarHelper::savePackage exception caught!" );
}
osl::File::remove( rPackageURL );
@@ -294,7 +294,7 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterJarHelper::savePackage exception catched!" );
+ OSL_FAIL( "XMLFilterJarHelper::savePackage exception caught!" );
}
}
@@ -365,7 +365,7 @@ bool XMLFilterJarHelper::copyFile( const Reference< XHierarchicalNameAccess >& x
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterJarHelper::copyFile exception catched" );
+ OSL_FAIL( "XMLFilterJarHelper::copyFile exception caught" );
}
return false;
}
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index f1da2804e979..06c80142a184 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -134,7 +134,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
}
catch(const Exception&)
{
- OSL_FAIL( "XMLFilterSettingsDialog::XMLFilterSettingsDialog exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::XMLFilterSettingsDialog exception caught!" );
}
}
@@ -427,7 +427,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::createUniqueInterfaceName exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::createUniqueInterfaceName exception caught!" );
}
OUString aInterfaceName( rInterfaceName );
@@ -469,7 +469,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
bOk = false;
}
}
@@ -590,7 +590,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
bOk = false;
}
}
@@ -648,7 +648,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
bOk = false;
}
}
@@ -663,7 +663,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
bOk = false;
}
}
@@ -677,7 +677,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
bOk = false;
}
}
@@ -693,7 +693,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
bOk = false;
}
@@ -706,7 +706,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception caught!" );
}
}
@@ -876,7 +876,7 @@ void XMLFilterSettingsDialog::onDelete()
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::onDelete exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::onDelete exception caught!" );
}
}
}
@@ -1204,7 +1204,7 @@ void XMLFilterSettingsDialog::initFilterList()
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterSettingsDialog::initFilterList exception catched!" );
+ OSL_FAIL( "XMLFilterSettingsDialog::initFilterList exception caught!" );
}
}
@@ -1656,7 +1656,7 @@ bool copyStreams( const Reference< XInputStream >& xIS, const Reference< XOutput
}
catch(const Exception&)
{
- OSL_FAIL( "copyStreams() exception catched!" );
+ OSL_FAIL( "copyStreams() exception caught!" );
}
return false;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index e3d5e9bcad94..7da2fdee4bbd 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -126,7 +126,7 @@ bool XMLFilterTabDialog::onOk()
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterTabDialog::onOk exception catched!" );
+ OSL_FAIL( "XMLFilterTabDialog::onOk exception caught!" );
}
}
}
@@ -184,7 +184,7 @@ bool XMLFilterTabDialog::onOk()
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterTabDialog::onOk exception catched!" );
+ OSL_FAIL( "XMLFilterTabDialog::onOk exception caught!" );
}
}
}
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 66daa63b3778..23348fdd68b4 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -124,7 +124,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
}
catch( const Exception& )
{
- OSL_FAIL( "checkComponent exception catched!" );
+ OSL_FAIL( "checkComponent exception caught!" );
}
return false;
@@ -169,7 +169,7 @@ XMLFilterTestDialog::XMLFilterTestDialog(vcl::Window* pParent,
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterTestDialog::XMLFilterTestDialog exception catched!" );
+ OSL_FAIL( "XMLFilterTestDialog::XMLFilterTestDialog exception caught!" );
}
}
@@ -187,7 +187,7 @@ void XMLFilterTestDialog::dispose()
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterTestDialog::~XMLFilterTestDialog exception catched!" );
+ OSL_FAIL( "XMLFilterTestDialog::~XMLFilterTestDialog exception caught!" );
}
delete m_pFilterInfo;
@@ -526,7 +526,7 @@ void XMLFilterTestDialog::doExport( const Reference< XComponent >& xComp )
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterTestDialog::doExport exception catched!" );
+ OSL_FAIL( "XMLFilterTestDialog::doExport exception caught!" );
}
}
@@ -641,7 +641,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
}
catch(const Exception&)
{
- OSL_FAIL("XMLFilterTestDialog::import catched an exception" );
+ OSL_FAIL("XMLFilterTestDialog::import caught an exception" );
}
}
@@ -716,7 +716,7 @@ Reference< XComponent > XMLFilterTestDialog::getFrontMostDocument( const OUStrin
}
catch( const Exception& )
{
- OSL_FAIL( "XMLFilterTestDialog::getFrontMostDocument exception catched!" );
+ OSL_FAIL( "XMLFilterTestDialog::getFrontMostDocument exception caught!" );
}
return xRet;
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 58cfa088b24d..38547cc0327f 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -183,7 +183,7 @@ class ODatabaseForm :public OFormComponents
rtl::Reference<OFormSubmitResetThread> m_pThread;
OUString m_sCurrentErrorContext;
// will be used as additional context information
- // when an exception is catched and forwarded to the listeners
+ // when an exception is caught and forwarded to the listeners
sal_Int32 m_nResetsPending;
// <overwritten_properties>
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index c8e9f1fa21f2..79d8dabe9c53 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -79,7 +79,7 @@ inline bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource
{ throw; } // should not be suppressed!
catch(const css::uno::Exception&)
{ return false; } // ??? We defined to return a boolean value instead of throwing exceptions...
- // (OK: RuntimeExceptions should not be catched inside the core..)
+ // (OK: RuntimeExceptions should not be caught inside the core..)
return true;
}
diff --git a/include/desktop/exithelper.h b/include/desktop/exithelper.h
index d6e337ce0f2a..76942393a4c8 100644
--- a/include/desktop/exithelper.h
+++ b/include/desktop/exithelper.h
@@ -25,7 +25,7 @@ enum EExitCodes {
EXITHELPER_NO_ERROR = 0,
/* pipe was detected - second office must terminate itself */
EXITHELPER_SECOND_OFFICE = 1,
- /* an uno exception was catched during startup */
+ /* an uno exception was caught during startup */
EXITHELPER_FATAL_ERROR = 77,
/* user force automatic restart after crash */
EXITHELPER_CRASH_WITH_RESTART = 79,
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
index c07c93b644de..697f5d0c7c83 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
@@ -173,7 +173,7 @@ public class _XMultiPropertySet extends MultiMethodTest {
return;
}
- // Change one of the property to be sure that this event was catched.
+ // Change one of the property to be sure that this event was caught.
for (int i=0; i<testPropsAmount;i++) {
log.print("Trying to change property " + testPropsNames[i]);
try {
diff --git a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
index 2c6d414a7fd6..bfc06a9dc640 100644
--- a/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
+++ b/qadevOOo/tests/java/ifc/frame/_XModuleManager.java
@@ -60,7 +60,7 @@ public class _XModuleManager extends MultiMethodTest {
* value of method <CODE>indetify()</CODE> if the method was called with
* coresponding value.<p>
* As enhancement the method <CODE>identify()</CODE> was called with invalid
- * parameter. In this case the thrown exceptions was catched.
+ * parameter. In this case the thrown exceptions were caught.
*/
public XModuleManager oObj = null;
/**
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 84946e8f7b82..f2abe0dc7ae0 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -147,7 +147,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
}
catch(Exception&)
{
- OSL_FAIL("Exception catched!");
+ OSL_FAIL("Exception caught!");
}
m_bInChange = false;
}
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 4f0c9c049a8f..5a5696861bb9 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -233,7 +233,7 @@ void OXMLCell::EndElement()
}
catch(uno::Exception&)
{
- OSL_FAIL("OXMLCell::EndElement -> exception catched");
+ OSL_FAIL("OXMLCell::EndElement -> exception caught");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index 8a8dacd9ab65..cc9b689d1dde 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -82,7 +82,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
}
catch(const Exception&)
{
- OSL_FAIL("Exception catched while putting props into report component!");
+ OSL_FAIL("Exception caught while putting props into report component!");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 70b7997a1bf0..d44a982b8b33 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -67,7 +67,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
}
catch(const Exception&)
{
- OSL_FAIL("Exception catched while putting Function props!");
+ OSL_FAIL("Exception caught while putting Function props!");
}
}
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 5fba2dc2a01b..323d47e897d8 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -80,7 +80,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the report definition props");
+ OSL_FAIL("Exception caught while filling the report definition props");
}
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index a62aaed07911..019eb3fa4054 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -75,7 +75,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the report definition props");
+ OSL_FAIL("Exception caught while filling the report definition props");
}
}
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index d630023d3ebc..586296daf52d 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -88,7 +88,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
}
catch(const Exception&)
{
- OSL_FAIL("Exception catched while putting Function props!");
+ OSL_FAIL("Exception caught while putting Function props!");
}
}
}
@@ -118,7 +118,7 @@ void OXMLFunction::EndElement()
m_xFunction.clear();
}catch(uno::Exception&)
{
- OSL_FAIL("Exception catched!");
+ OSL_FAIL("Exception caught!");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 41b273d5f5f7..8c32ad4c8957 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -179,7 +179,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
}
catch(const Exception&)
{
- OSL_FAIL("Exception catched while putting group props!");
+ OSL_FAIL("Exception caught while putting group props!");
}
}
}
@@ -256,7 +256,7 @@ void OXMLGroup::EndElement()
m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup));
}catch(uno::Exception&)
{
- OSL_FAIL("Exception catched!");
+ OSL_FAIL("Exception caught!");
}
}
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 0ca51f5a24c8..d3e0095f4731 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -312,7 +312,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,
}
catch(uno::Exception&)
{
- OSL_FAIL("OXMLHelper::copyStyleElements -> exception catched");
+ OSL_FAIL("OXMLHelper::copyStyleElements -> exception caught");
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index fdc6fffa4893..05c9cbf8ec2d 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -99,7 +99,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the image props");
+ OSL_FAIL("Exception caught while filling the image props");
}
}
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 08fe41429142..a31fd64ee208 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -241,7 +241,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
}
catch(uno::Exception&)
{
- OSL_FAIL("Exception catched while filling the report definition props");
+ OSL_FAIL("Exception caught while filling the report definition props");
}
bExport = false;
}
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 4c2ed009dc3a..8f572dad4dde 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -99,7 +99,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the report definition props");
+ OSL_FAIL("Exception caught while filling the report definition props");
}
}
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index f879c84c0e73..9a68bd59c7a6 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -72,7 +72,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the report definition props");
+ OSL_FAIL("Exception caught while filling the report definition props");
}
}
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 351e8d426ead..c8e714237f0a 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -93,7 +93,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the section props");
+ OSL_FAIL("Exception caught while filling the section props");
}
}
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 812af6a6b651..c36fdfc33077 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -108,7 +108,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport
}
catch(Exception&)
{
- OSL_FAIL("Exception catched while filling the section props");
+ OSL_FAIL("Exception caught while filling the section props");
}
}
@@ -266,7 +266,7 @@ void OXMLTable::EndElement()
}
catch(Exception&)
{
- OSL_FAIL("OXMLTable::EndElement -> exception catched");
+ OSL_FAIL("OXMLTable::EndElement -> exception caught");
}
}
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index d4e69f676686..50bd4d4c31b8 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -596,7 +596,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
}
catch(uno::Exception&)
{
- OSL_FAIL("Exception catched while try to get a group!");
+ OSL_FAIL("Exception caught while try to get a group!");
}
}
return EditBrowseBox::CLEAN;
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 20c14353f4b1..09325299e7aa 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -343,7 +343,7 @@ void OGroupUndo::implReInsert( )
}
catch(uno::Exception&)
{
- OSL_FAIL("Exception catched while undoing remove group");
+ OSL_FAIL("Exception caught while undoing remove group");
}
}
@@ -355,7 +355,7 @@ void OGroupUndo::implReRemove( )
}
catch(uno::Exception&)
{
- OSL_FAIL("Exception catched while redoing remove group");
+ OSL_FAIL("Exception caught while redoing remove group");
}
}
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index e5d0228cc989..5f5bbca803d1 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -104,7 +104,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
}
catch(uno::Exception&)
{
- OSL_FAIL("Exception catched!");
+ OSL_FAIL("Exception caught!");
}
m_pFunc.reset(new DlgEdFuncSelect( this ));
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 87fedeb20e08..85668f952554 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -825,7 +825,7 @@ struct osl_procStat
char signal[24]; /* pending signals */
char blocked[24]; /* blocked signals */
char sigignore[24]; /* ignored signals */
- char sigcatch[24]; /* catched signals */
+ char sigcatch[24]; /* caught signals */
unsigned long wchan; /* 'channel' the process is waiting in */
unsigned long nswap; /* ? */
unsigned long cnswap; /* ? */
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index f2151019e8d5..a76c6457557d 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -617,7 +617,7 @@ bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void*
}
catch( Exception& )
{
- OSL_FAIL( "sd::SdTransferable::WriteObject(), exception catched!" );
+ OSL_FAIL( "sd::SdTransferable::WriteObject(), exception caught!" );
bRet = false;
}
}
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index dfb7902dc7f2..b27a8a99db77 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -231,7 +231,7 @@ void SAL_CALL SdXCustomPresentation::dispose()
SolarMutexGuard aGuard;
if( bDisposing )
- return; // catched a recursion
+ return; // caught a recursion
bDisposing = true;
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 2ec434d312c8..765475c758cc 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -212,18 +212,18 @@ bool FmSearchEngine::MoveCursor()
catch(css::sdbc::SQLException const& e)
{
(void)e;
- SAL_WARN( "svx", "FmSearchEngine::MoveCursor: catched a DatabaseException: " << e.SQLState );
+ SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught a DatabaseException: " << e.SQLState );
bSuccess = false;
}
catch(Exception const& e)
{
(void)e;
- SAL_WARN( "svx", "FmSearchEngine::MoveCursor: catched an Exception: " << e.Message);
+ SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught an Exception: " << e.Message);
bSuccess = false;
}
catch(...)
{
- OSL_FAIL("FmSearchEngine::MoveCursor : catched an unknown Exception !");
+ OSL_FAIL("FmSearchEngine::MoveCursor : caught an unknown Exception !");
bSuccess = false;
}
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index fd91d43e9a39..5de1ae5490cf 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -940,7 +940,7 @@ namespace svxform
#ifdef DBG_UTIL
DBG_ASSERT(bHasHiddenControlsFormat, "NavigatorTree::implExecuteDataTransfer: only copying of hidden controls is supported !");
- // should be catched by AcceptDrop
+ // should be caught by AcceptDrop
#endif
// because i want to select all targets (and only them)
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 7943383a5994..4e9f72343351 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1247,7 +1247,7 @@ void DocxExport::WriteActiveX()
}
catch(const uno::Exception&)
{
- SAL_WARN("sw.ww8", "WriteActiveX() ::Failed to copy Inputstream to outputstream exception catched!");
+ SAL_WARN("sw.ww8", "WriteActiveX() ::Failed to copy Inputstream to outputstream exception caught!");
}
xOutStream->closeOutput();
@@ -1381,7 +1381,7 @@ void DocxExport::WriteEmbeddings()
}
catch(const uno::Exception&)
{
- SAL_WARN("sw.ww8", "WriteEmbeddings() ::Failed to copy Inputstream to outputstream exception catched!");
+ SAL_WARN("sw.ww8", "WriteEmbeddings() ::Failed to copy Inputstream to outputstream exception caught!");
}
xOutStream->closeOutput();
}
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index d8679c095364..ecf173d78cf8 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1289,7 +1289,7 @@ void GetPropsUsingHeadRequest(DAVResource& resource,
// clean cached value of PROPFIND property names
// PROPPATCH can change them
Content::removeCachedPropertyNames(aTargetURL);
- // test if HEAD allowed, if not, throw, should be catched immediately
+ // test if HEAD allowed, if not, throw, should be caught immediately
// SC_GONE used internally by us, see comment in Content::getPropertyValues
// in the catch scope
if (aDAVOptions.getHttpResponseStatusCode() != SC_GONE &&
diff --git a/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl b/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
index f5450887f3b2..f4cb92f4eb27 100644
--- a/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
+++ b/udkapi/com/sun/star/beans/TolerantPropertySetResultType.idl
@@ -43,7 +43,7 @@ constants TolerantPropertySetResultType
<p>For example if a
com::sun::star::beans::UnknownPropertyException
- was catched.</p>
+ was caught.</p>
*/
const short UNKNOWN_PROPERTY = 1;
@@ -51,7 +51,7 @@ constants TolerantPropertySetResultType
<p>For example if a
com::sun::star::lang::IllegalArgumentException
- was catched.</p>
+ was caught.</p>
*/
const short ILLEGAL_ARGUMENT = 2;
@@ -59,7 +59,7 @@ constants TolerantPropertySetResultType
<p>For example if a
com::sun::star::beans::PropertyVetoException
- was catched.</p>
+ was caught.</p>
*/
const short PROPERTY_VETO = 3;
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index f9307a12acc5..0332e94718ac 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -58,7 +58,7 @@
#define SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION) \
{ \
OUStringBuffer sMsg(256); \
- sMsg.append("Unexpected exception catched. Original message was:\n\"" ); \
+ sMsg.append("Unexpected exception caught. Original message was:\n\"" ); \
sMsg.append (SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION.Message); \
sMsg.append("\"" ); \
}
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index 612418335deb..aa1c3cbe2c74 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -98,7 +98,7 @@ int main( int argc,char* argv[] )
}
catch( ... )
{
- printf( "catched exception" );
+ printf( "caught exception" );
throw;
}
return 0;
More information about the Libreoffice-commits
mailing list