[Libreoffice-commits] .: 2 commits - dbaccess/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Apr 13 12:38:32 PDT 2011
dbaccess/source/core/api/KeySet.cxx | 6 +--
dbaccess/source/core/api/tablecontainer.cxx | 6 +--
dbaccess/source/core/dataaccess/connection.cxx | 6 +--
dbaccess/source/core/dataaccess/databasedocument.cxx | 4 +-
dbaccess/source/core/dataaccess/documentdefinition.cxx | 28 ++++++++---------
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 2 -
dbaccess/source/filter/xml/xmlDataSource.cxx | 6 +--
dbaccess/source/filter/xml/xmlExport.cxx | 8 ++--
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 2 -
dbaccess/source/filter/xml/xmlLogin.cxx | 8 ++--
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 2 -
dbaccess/source/filter/xml/xmlfilter.cxx | 2 -
dbaccess/source/ui/app/AppController.cxx | 6 +--
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 +-
dbaccess/source/ui/browser/brwview.cxx | 4 +-
dbaccess/source/ui/browser/unodatbr.cxx | 20 ++++++------
dbaccess/source/ui/dlg/queryfilter.cxx | 6 +--
dbaccess/source/ui/dlg/queryorder.cxx | 2 -
dbaccess/source/ui/misc/UITools.cxx | 14 ++++----
dbaccess/source/ui/uno/ColumnPeer.cxx | 2 -
20 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit f9cbcef0ee0a7c3912ece4f1125d609f7539ba31
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 12:04:28 2011 +0100
catch by const reference
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index f924c85..c5a47ae 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -227,10 +227,10 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPr
if (xComponent.is() && _rEvtLst.is())
xComponent->addEventListener(_rEvtLst);
}
- catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); }
- catch(SQLWarning& e) { aInfo = SQLExceptionInfo(e); }
- catch(SQLException& e) { aInfo = SQLExceptionInfo(e); }
- catch(constException&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
+ catch(const SQLContext& e) { aInfo = SQLExceptionInfo(e); }
+ catch(const SQLWarning& e) { aInfo = SQLExceptionInfo(e); }
+ catch(const SQLException& e) { aInfo = SQLExceptionInfo(e); }
+ catch(const Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
return aInfo;
}
commit 98e0b10b5b16c3888ec8babeab26c35c9526246d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 09:40:26 2011 +0100
catch by const reference
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 5ae3385..6ec44dc 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -129,7 +129,7 @@ OKeySet::~OKeySet()
{
::comphelper::disposeComponent(m_xStatement);
}
- catch(Exception&)
+ catch(const Exception&)
{
m_xStatement = NULL;
}
@@ -764,7 +764,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString
}
}
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("Could not execute GeneratedKeys() stmt");
}
@@ -886,7 +886,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
OSL_ENSURE(m_xSet.is(),"No resultset form statement!");
bRefetch = m_xSet->next();
}
- catch(Exception)
+ catch(const Exception&)
{
bRefetch = false;
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 8aac98a..b946c22 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -96,7 +96,7 @@ namespace
if ( aState != PropertyState_DEFAULT_VALUE )
break;
}
- catch(Exception)
+ catch(const Exception&)
{
OSL_FAIL( "lcl_isPropertySetDefaulted: Exception caught!" );
}
@@ -325,7 +325,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
}
}
}
- catch(Exception&)
+ catch(const Exception&)
{
throw;
}
@@ -430,7 +430,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
m_xTableDefinitions->removeByName(_sElementName);
}
}
- catch(Exception&)
+ catch(const Exception&)
{
m_bInDrop = sal_False;
throw;
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index e3de136..4bfd313 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -342,7 +342,7 @@ OConnection::OConnection(ODatabaseSource& _rDB
xMeta = getMetaData();
bCase = xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers();
}
- catch(SQLException&)
+ catch(const SQLException&)
{
}
Reference< XNameContainer > xTableDefinitions(_rDB.getTables(),UNO_QUERY);
@@ -533,7 +533,7 @@ void OConnection::disposing()
if (m_xMasterConnection.is())
m_xMasterConnection->close();
}
- catch(Exception)
+ catch(const Exception&)
{
}
m_xMasterConnection = NULL;
@@ -734,7 +734,7 @@ Reference< XTablesSupplier > OConnection::getMasterTables()
if ( xMeta.is() )
m_xMasterTables = ::dbtools::getDataDefinitionByURLAndConnection( xMeta->getURL(), m_xMasterConnection, m_aContext.getLegacyServiceFactory() );
}
- catch(SQLException&)
+ catch(const SQLException&)
{
}
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index c72d7f7..16e5c06 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1575,7 +1575,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
{
xInfoSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Version" )), uno::makeAny( aVersion ) );
}
- catch( uno::Exception& )
+ catch( const uno::Exception& )
{
}
}
@@ -1988,7 +1988,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
{
sModuleId = m_xModuleManager->identify( _xComponent );
}
- catch(uno::Exception)
+ catch(const uno::Exception&)
{
}
uno::Reference< frame::XUntitledNumbers > xNumberedControllers;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 5e7016f..48be3e0 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -431,7 +431,7 @@ namespace dbaccess
OSL_ENSURE( aAlternativeClassID == _rClassId, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (2)!" );
#endif
}
- catch ( Exception& )
+ catch ( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -496,7 +496,7 @@ void ODocumentDefinition::closeObject()
if ( xCloseable.is() )
xCloseable->close(sal_True);
}
- catch(Exception)
+ catch(const Exception&)
{
}
m_xEmbeddedObject = NULL;
@@ -681,7 +681,7 @@ namespace
{
m_aOriginalSize = m_xVisObject->getVisualAreaSize( Aspects::MSOLE_CONTENT );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
OSL_FAIL( "PreserveVisualAreaSize::PreserveVisualAreaSize: caught an exception!" );
}
@@ -696,7 +696,7 @@ namespace
{
m_xVisObject->setVisualAreaSize( Aspects::MSOLE_CONTENT, m_aOriginalSize );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
OSL_FAIL( "PreserveVisualAreaSize::~PreserveVisualAreaSize: caught an exception!" );
}
@@ -728,7 +728,7 @@ namespace
m_xLayoutManager->lock();
}
- catch( Exception& )
+ catch( const Exception& )
{
OSL_FAIL( "LayoutManagerLock::LayoutManagerLock: caught an exception!" );
}
@@ -742,7 +742,7 @@ namespace
if ( m_xLayoutManager.is() )
m_xLayoutManager->unlock();
}
- catch( Exception& )
+ catch( const Exception& )
{
OSL_FAIL( "LayoutManagerLock::~LayoutManagerLock: caught an exception!" );
}
@@ -1251,7 +1251,7 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R
if ( xCloseable.is() )
xCloseable->close(sal_True);
}
- catch(Exception)
+ catch(const Exception&)
{
}
m_xEmbeddedObject = NULL;
@@ -1343,7 +1343,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
notifyDataSourceModified();
}
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
}
@@ -1436,7 +1436,7 @@ sal_Bool ODocumentDefinition::saveAs()
Reference< XNameContainer > xNameContainer( m_xParentContainer, UNO_QUERY_THROW );
xNameContainer->insertByName( sOldName, makeAny( xComponent ) );
}
- catch(Exception&)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1452,7 +1452,7 @@ sal_Bool ODocumentDefinition::saveAs()
}
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!");
}
@@ -1808,7 +1808,7 @@ void ODocumentDefinition::onCommandPreview(Any& _rImage)
_rImage = xTransfer->getTransferData( aFlavor );
}
}
- catch( Exception )
+ catch( const Exception& )
{
}
}
@@ -1911,7 +1911,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor
nObjectType, sName, _bForEditing
);
}
- catch( RuntimeException& ) { throw; }
+ catch( const RuntimeException& ) { throw; }
catch( const Exception& )
{
throw WrappedTargetException(
@@ -1958,7 +1958,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt
{
impl_store_throw();
}
- catch( RuntimeException& ) { throw; }
+ catch( const RuntimeException& ) { throw; }
catch( const Exception& )
{
throw WrappedTargetException(
@@ -1975,7 +1975,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt
{
bSuccess = impl_close_throw();
}
- catch( RuntimeException& ) { throw; }
+ catch( const RuntimeException& ) { throw; }
catch( const Exception& )
{
throw WrappedTargetException(
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index fad4a02..005455d 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -77,7 +77,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sValue));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 2490e2d..8344fa8 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -88,7 +88,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sValue));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -99,7 +99,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sValue == s_sTRUE ? sal_True : sal_False));
bFoundSuppressVersionColumns = true;
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -203,7 +203,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sal_True));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index c2b6041..b1b49f3 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1189,7 +1189,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
exportCollection(xCollection,XML_TOKEN_INVALID,XML_TOKEN_INVALID,sal_False,aMemFunc);
}
}
- catch(Exception&)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1323,9 +1323,9 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
}
aProps[nLength].Value <<= aQueries;
}
- catch(Exception)
+ catch(const Exception&)
{
- OSL_FAIL("ODBExport::GetViewSettings: Exception catched!");
+ OSL_FAIL("ODBExport::GetViewSettings: Exception caught!");
}
}
}
@@ -1350,7 +1350,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
aProps[nLength].Value = aValue;
}
}
- catch(Exception)
+ catch(const Exception&)
{
OSL_FAIL("Could not access layout information from the data source!");
}
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 605b0cb..4958633 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -117,7 +117,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sURL));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index 487ec48..6925878 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -82,7 +82,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_USER,makeAny(sValue));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -93,7 +93,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_ISPASSWORDREQUIRED,makeAny((sValue == s_sTRUE ? sal_True : sal_False)));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -113,14 +113,14 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
{
Reference< XDataSource>(xDataSource,UNO_QUERY_THROW)->setLoginTimeout(sValue.toInt32());
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
break;
}
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 61ef570..77e786f 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -156,7 +156,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
{
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sURL.makeStringAndClear()));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index cff4e1a..8857c55 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -908,7 +908,7 @@ void ODBFilter::setPropertyInfo()
{
xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(aInfo));
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 7545e73..91fc1ab 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -446,7 +446,7 @@ void SAL_CALL OApplicationController::disposing()
m_xModel.clear();
}
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -468,10 +468,10 @@ sal_Bool OApplicationController::Construct(Window* _pParent)
getContainer()->Construct();
bSuccess = sal_True;
}
- catch(SQLException&)
+ catch(const SQLException&)
{
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("OApplicationController::Construct : the construction of UnoDataBrowserView failed !");
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index b10ee6a..c488a0c 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -252,7 +252,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper()
if ( xCloseable.is() )
xCloseable->close(sal_True);
}
- catch(Exception)
+ catch(const Exception&)
{
OSL_FAIL("Exception thrown while disposing preview frame!");
}
@@ -1167,7 +1167,7 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
xFrames->append(m_xFrame);
}
}
- catch(Exception)
+ catch(const Exception&)
{
}
}
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 3da8303..e237036 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -125,7 +125,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont
OSL_ENSURE(m_pVclControl != NULL, "UnoDataBrowserView::Construct : no real grid control !");
}
- catch(Exception&)
+ catch(const Exception&)
{
::comphelper::disposeComponent(m_xGrid);
throw;
@@ -151,7 +151,7 @@ UnoDataBrowserView::~UnoDataBrowserView()
::comphelper::disposeComponent(m_xGrid);
::comphelper::disposeComponent(m_xMe);
}
- catch(Exception)
+ catch(const Exception&)
{}
DBG_DTOR(UnoDataBrowserView,NULL);
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 017794d..4b7e249 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -373,7 +373,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
m_xCollator = Reference< XCollator >( getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator")) ), UNO_QUERY_THROW );
m_xCollator->loadDefaultCollator( Application::GetSettings().GetLocale(), 0 );
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("SbaTableQueryBrowser::Construct: could not create (or start listening at) the database context!");
}
@@ -858,7 +858,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
}
}
}
- catch(Exception&)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
return sal_False;
@@ -1279,7 +1279,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS
}
}
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("SbaTableQueryBrowser::populateTree: could not fill the tree");
}
@@ -2034,7 +2034,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
{
OSL_FAIL("Object already disposed!");
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("SbaTableQueryBrowser::Execute(ID_BROWSER_?): could not clone the cursor!");
}
@@ -2200,7 +2200,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
}
}
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("SbaTableQueryBrowser::populateTree: could not fill the tree");
}
@@ -2498,7 +2498,7 @@ sal_Bool SbaTableQueryBrowser::implLoadAnything(const ::rtl::OUString& _rDataSou
DBG_UNHANDLED_EXCEPTION();
}
}
- catch(Exception&)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -2771,7 +2771,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any());
xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any());
}
- catch(Exception&)
+ catch(const Exception&)
{
// reset the values
xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any());
@@ -3107,7 +3107,7 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection )
else
OSL_FAIL("SbaTableQueryBrowser::unloadAndCleanup: something strange happended!");
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("SbaTableQueryBrowser::unloadAndCleanup: could not reset the form");
}
@@ -3218,7 +3218,7 @@ void SbaTableQueryBrowser::impl_initialize()
if ( xFormMultiSet.is() )
xFormMultiSet->setPropertyValues(aProperties, aValues);
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -3485,7 +3485,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa
{
nCompareResult = m_xCollator->compareString(sLeftText, sRightText);
}
- catch(Exception&)
+ catch(const Exception&)
{
}
}
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index e6ed20e..3e21d8d 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -189,7 +189,7 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent,
fillLines(aValues);
}
- catch(Exception&)
+ catch(const Exception&)
{
FreeResource();
throw;
@@ -365,7 +365,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
}
}
}
- catch(Exception)
+ catch(const Exception&)
{
}
@@ -846,7 +846,7 @@ void DlgFilterCrit::BuildWherePart()
m_xQueryComposer->setStructuredFilter(aFilter);
m_xQueryComposer->setStructuredHavingClause(aHaving);
}
- catch(Exception)
+ catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 4cbc85f..e0eebc8 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -283,7 +283,7 @@ void DlgOrderCrit::EnableLines()
else
sOrder += ::dbtools::quoteName(sQuote,sName);
}
- catch(Exception)
+ catch(const Exception&)
{
}
if(m_aValueList[i]->GetSelectEntryPos())
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 16f6867..f924c85 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -162,7 +162,7 @@ SQLExceptionInfo createConnection( const ::rtl::OUString& _rsDataSourceName,
{
xProp.set(_xDatabaseContext->getByName(_rsDataSourceName),UNO_QUERY);
}
- catch(Exception&)
+ catch(const Exception&)
{
}
SQLExceptionInfo aInfo;
@@ -190,7 +190,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPr
bPwdReq = ::cppu::any2bool(_xDataSource->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED));
_xDataSource->getPropertyValue(PROPERTY_USER) >>= sUser;
}
- catch(Exception&)
+ catch(const Exception&)
{
OSL_FAIL("createConnection: error while retrieving data source properties!");
}
@@ -230,7 +230,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XPr
catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); }
catch(SQLWarning& e) { aInfo = SQLExceptionInfo(e); }
catch(SQLException& e) { aInfo = SQLExceptionInfo(e); }
- catch(Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
+ catch(constException&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
return aInfo;
}
@@ -777,7 +777,7 @@ sal_Bool checkDataSourceAvailable(const ::rtl::OUString& _sDataSourceName,const
{
bRet = xDataBaseContext->getByName(_sDataSourceName).hasValue();
}
- catch(Exception)
+ catch(const Exception&)
{
}
}
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 4212a8e..48ed07b 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -97,7 +97,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn)
_xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision;
_xColumn->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAutoIncrement;
}
- catch(Exception)
+ catch(const Exception&)
{
}
More information about the Libreoffice-commits
mailing list