[Libreoffice-commits] .: 2 commits - cui/source formula/source fpicker/source framework/source
Takeshi Abe
tabe at kemper.freedesktop.org
Tue Dec 13 08:44:14 PST 2011
cui/source/options/optinet2.cxx | 18 ---
formula/source/ui/dlg/formula.cxx | 2
fpicker/source/office/OfficeFilePicker.cxx | 4
fpicker/source/office/fpsmartcontent.cxx | 10 -
fpicker/source/office/iodlg.cxx | 2
fpicker/source/unx/kde_unx/UnxFPentry.cxx | 2
framework/source/classes/framecontainer.cxx | 2
framework/source/classes/fwktabwindow.cxx | 6 -
framework/source/dispatch/closedispatcher.cxx | 2
framework/source/dispatch/dispatchprovider.cxx | 4
framework/source/dispatch/mailtodispatcher.cxx | 4
framework/source/dispatch/popupmenudispatcher.cxx | 8 -
framework/source/fwe/helper/configimporter.cxx | 4
framework/source/fwe/xml/menuconfiguration.cxx | 12 +-
framework/source/fwe/xml/statusbarconfiguration.cxx | 12 +-
framework/source/fwe/xml/toolboxconfiguration.cxx | 12 +-
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 4
framework/source/fwi/helper/mischelper.cxx | 9 -
framework/source/fwi/jobs/configaccess.cxx | 2
framework/source/fwi/uielement/constitemcontainer.cxx | 4
framework/source/fwi/uielement/itemcontainer.cxx | 2
framework/source/fwi/uielement/rootitemcontainer.cxx | 4
framework/source/helper/uiconfigelementwrapperbase.cxx | 6 -
framework/source/jobs/helponstartup.cxx | 4
framework/source/jobs/job.cxx | 12 +-
framework/source/jobs/jobdispatch.cxx | 2
framework/source/jobs/jobexecutor.cxx | 2
framework/source/layoutmanager/helpers.cxx | 2
framework/source/layoutmanager/helpers.hxx | 5
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/recording/dispatchrecorder.cxx | 6 -
framework/source/services/frame.cxx | 8 -
framework/source/services/license.cxx | 2
framework/source/services/pathsettings.cxx | 2
framework/source/services/sessionlistener.cxx | 8 -
framework/source/services/substitutepathvars.cxx | 4
framework/source/tabwin/tabwindow.cxx | 12 +-
framework/source/uiconfiguration/globalsettings.cxx | 12 +-
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 2
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 52 ++++-----
framework/source/uiconfiguration/uicategorydescription.cxx | 20 +--
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 54 +++++-----
framework/source/uiconfiguration/windowstateconfiguration.cxx | 26 ++--
framework/source/uielement/addonstoolbarmanager.cxx | 8 -
framework/source/uielement/addonstoolbarwrapper.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 2
framework/source/uielement/complextoolbarcontroller.cxx | 4
framework/source/uielement/generictoolbarcontroller.cxx | 4
framework/source/uielement/headermenucontroller.cxx | 6 -
framework/source/uielement/macrosmenucontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 26 ++--
framework/source/uielement/menubarwrapper.cxx | 6 -
framework/source/uielement/newmenucontroller.cxx | 6 -
framework/source/uielement/popupmenucontroller.cxx | 2
framework/source/uielement/progressbarwrapper.cxx | 4
framework/source/uielement/recentfilesmenucontroller.cxx | 2
framework/source/uielement/statusbarmanager.cxx | 9 -
framework/source/uielement/statusbarwrapper.cxx | 4
framework/source/uielement/toolbarsmenucontroller.cxx | 24 ++--
framework/source/uielement/toolbarwrapper.cxx | 4
framework/source/uifactory/addonstoolboxfactory.cxx | 4
framework/source/uifactory/factoryconfiguration.cxx | 10 -
framework/source/uifactory/uielementfactorymanager.cxx | 8 -
framework/source/uifactory/windowcontentfactorymanager.cxx | 6 -
framework/source/xml/imagesconfiguration.cxx | 12 +-
65 files changed, 248 insertions(+), 281 deletions(-)
New commits:
commit 55b9dc002a7ffbf5d3abdece74a09029e2da94a5
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Dec 14 01:29:32 2011 +0900
shrinked useless constants/defines
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index f1bcd07..5d1b394 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -107,32 +107,14 @@ using namespace ::com::sun::star::uno;
using namespace ::sfx2;
using ::rtl::OUString;
-
-// define ----------------------------------------------------------------
-
-// different delimiter for Unix (:) and Windows (;)
-
-#ifdef UNX
-#define CLASSPATH_DELIMITER ':'
-#else
-#define CLASSPATH_DELIMITER ';'
-#endif
-
// static ----------------------------------------------------------------
#define C2U(cChar) OUString::createFromAscii(cChar)
-#define INET_SEARCH_TOKEN '"'
-#define RET_ALL ((short)200)
-#define CFG_READONLY_DEFAULT FALSE
-
#include <sal/config.h>
SV_IMPL_PTRARR( SfxFilterPtrArr, SfxFilterPtr )
-const char* SEARCHENGINE_INI = "srcheng.ini";
-const char* SEARCHENGINE_GROUP = "SearchEngines-$(vlang)";
-
// -----------------------------------------------------------------------
void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 2f0de10..75fba5a 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -60,10 +60,6 @@
#include "osl/mutex.hxx"
#include "vcl/svapp.hxx"
-// define ----------------------------------------------------------------
-
-#define MAKE_ANY ::com::sun::star::uno::makeAny
-
// using ----------------------------------------------------------------
using namespace ::com::sun::star::container;
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index e2a22ce..66d1583 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -47,10 +47,7 @@
#include <vcl/window.hxx>
#include <vcl/toolbox.hxx>
-#define UIRESOURCE_PROTOCO_ASCII "private:"
-#define UIRESOURCE_RESOURCE_ASCII "resource"
-#define UIRESOURCE_URL_ASCII "private:resource"
-#define UIRESOURCE_URL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCE_URL_ASCII ))
+#define UIRESOURCE_URL RTL_CONSTASCII_USTRINGPARAM( "private:resource" )
#define UIRESOURCETYPE_TOOLBAR "toolbar"
#define UIRESOURCETYPE_STATUSBAR "statusbar"
#define UIRESOURCETYPE_MENUBAR "menubar"
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 3d5e3b9..45d3c8f 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -63,8 +63,6 @@
// ______________________________________________
// non exported const
-#define CFG_READONLY_DEFAULT sal_False
-
const ::rtl::OUString CFGPROP_USERPATHES(RTL_CONSTASCII_USTRINGPARAM("UserPaths"));
const ::rtl::OUString CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM("WritePath"));
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index e262a2c..3c1e1b4 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -71,10 +71,6 @@ using namespace com::sun::star::util;
using namespace com::sun::star::style;
using namespace com::sun::star::container;
-// Copied from Writer module
-//#define RID_SW_SHELLRES (RID_SW_START + 1250 + 1)
-//#define STR_ALLPAGE_HEADFOOT 14
-
const sal_uInt16 ALL_MENUITEM_ID = 1;
namespace framework
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index d5cc5cd..029cc52 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star;
#define css_ui ::com::sun::star::ui
#endif
-const sal_Int32 HELPID_PREFIX_LENGTH = 7;
static const char HELPID_PREFIX[] = "helpid:";
// Property names of a menu/menu item ItemDescriptor
commit 520891d058f9e936b9b8afb490b5a26c156008ef
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Dec 14 00:03:52 2011 +0900
catch exception by constant reference
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 81be3bc..d298795 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -722,7 +722,7 @@ void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,Formul
MakeTree(_pTree,pParent,m_pTokenArray->PrevRPN(),Count);
}
}
- catch(uno::Exception&)
+ catch(const uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index acdd069..8fe9eaf 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -168,10 +168,10 @@ namespace svt
// is really valid (some UCP's only tell this when asking for properties, not upon
// creation)
}
- catch( ContentCreationException& )
+ catch( const ContentCreationException& )
{
}
- catch( Exception& )
+ catch( const Exception& )
{
OSL_FAIL( "SmartContent::bindTo: unexpected exception caught!" );
}
@@ -217,7 +217,7 @@ namespace svt
// from here on, we definately know that the content is valid
m_eState = VALID;
}
- catch( Exception& )
+ catch( const Exception& )
{
// now we're definately invalid
m_eState = INVALID;
@@ -240,7 +240,7 @@ namespace svt
// from here on, we definately know that the content is valid
m_eState = VALID;
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( const ::com::sun::star::uno::Exception& )
{
// now we're definately invalid
m_eState = INVALID;
@@ -303,7 +303,7 @@ namespace svt
// now we're definately valid
m_eState = VALID;
}
- catch( Exception& )
+ catch( const Exception& )
{
// now we're definately invalid
m_eState = INVALID;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6b0cf32..9f09353 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -257,7 +257,7 @@ namespace
{
bRealExtensions = !_pDialog->ContentIsFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
}
- catch( ::com::sun::star::uno::Exception& )
+ catch( const ::com::sun::star::uno::Exception& )
{
DBG_WARNING( "Exception in lcl_autoUpdateFileExtension" );
}
diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
index 5533ab7..0937742 100644
--- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
@@ -67,7 +67,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
}
- catch( InvalidRegistryException& )
+ catch( const InvalidRegistryException& )
{
OSL_FAIL( "InvalidRegistryException caught" );
bRetVal = sal_False;
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 897c5f7..67e7dbf 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -248,7 +248,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32
aReadLock.unlock();
/* } SAFE */
}
- catch( std::out_of_range& )
+ catch( const std::out_of_range& )
{
// The index is not valid for current container-content - we must handle this case!
// We can return the default value ...
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 8866a9e..34e8b7a 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -133,11 +133,11 @@ void FwkTabPage::CreateDialog()
CallMethod( INITIALIZE_METHOD );
}
- catch ( lang::IllegalArgumentException& )
+ catch ( const lang::IllegalArgumentException& )
{
DBG_ERRORFILE( "FwkTabPage::CreateDialog(): illegal argument" );
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
DBG_ERRORFILE( "FwkTabPage::CreateDialog(): exception of XDialogProvider2::createContainerWindow()" );
}
@@ -154,7 +154,7 @@ sal_Bool FwkTabPage::CallMethod( const rtl::OUString& rMethod )
{
bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny( rMethod ), EXTERNAL_EVENT );
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 1294af0..c7ea2a3 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -404,7 +404,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG )
bQuickstarterRunning = bState;
}
}
- catch( css::uno::Exception& )
+ catch( const css::uno::Exception& )
{
}
bSuccess = bQuickstarterRunning ? implts_terminateApplication() : implts_establishBackingMode();
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index c858a5b..0ea4eee 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -607,7 +607,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
m_xFactory->createInstance(aHandler.m_sUNOName),
css::uno::UNO_QUERY);
}
- catch(css::uno::Exception&) {}
+ catch(const css::uno::Exception&) {}
// look if initialization is neccessary
css::uno::Reference< css::lang::XInitialization > xInit( xHandler, css::uno::UNO_QUERY );
@@ -624,7 +624,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
lContext[0] <<= xOwner;
xInit->initialize(lContext);
}
- catch(css::uno::Exception&) {}
+ catch(const css::uno::Exception&) {}
}
}
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 96ef8cd..095ff55 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -286,10 +286,10 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
xSystemShellExecute->execute( aURL.Complete, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
bSuccess = sal_True;
}
- catch (css::lang::IllegalArgumentException&)
+ catch (const css::lang::IllegalArgumentException&)
{
}
- catch (css::system::SystemShellExecuteException&)
+ catch (const css::system::SystemShellExecuteException&)
{
}
}
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 71fec48..07781a1 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -243,11 +243,11 @@ throw( css::uno::RuntimeException )
if ( xDispatchProvider.is() )
xDispatch = xDispatchProvider->queryDispatch( rURL, sTarget, nFlags );
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
throw;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -390,11 +390,11 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery()
xMenuBar, css::uno::UNO_QUERY );
}
}
- catch ( css::uno::RuntimeException& )
+ catch ( const css::uno::RuntimeException& )
{
throw;
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 24f7574..0aacbda 100644
--- a/framework/source/fwe/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -77,11 +77,11 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars(
}
}
}
- catch ( uno::RuntimeException& )
+ catch ( const uno::RuntimeException& )
{
throw;
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
}
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index a91d78e..966b774 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -102,11 +102,11 @@ throw ( WrappedTargetException )
xParser->parseStream( aInputSource );
return Reference< XIndexAccess >( xItemContainer, UNO_QUERY );
}
- catch ( RuntimeException& e )
+ catch ( const RuntimeException& e )
{
throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() );
}
- catch( SAXException& e )
+ catch( const SAXException& e )
{
SAXException aWrappedSAXException;
@@ -115,7 +115,7 @@ throw ( WrappedTargetException )
else
throw WrappedTargetException( aWrappedSAXException.Message, Reference< XInterface >(), Any() );
}
- catch( ::com::sun::star::io::IOException& e )
+ catch( const ::com::sun::star::io::IOException& e )
{
throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() );
}
@@ -152,15 +152,15 @@ throw ( WrappedTargetException )
OWriteMenuDocumentHandler aWriteMenuDocumentHandler( rMenuBarConfiguration, xWriter );
aWriteMenuDocumentHandler.WriteMenuDocument();
}
- catch ( RuntimeException& e )
+ catch ( const RuntimeException& e )
{
throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() );
}
- catch ( SAXException& e )
+ catch ( const SAXException& e )
{
throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() );
}
- catch ( ::com::sun::star::io::IOException& e )
+ catch ( const ::com::sun::star::io::IOException& e )
{
throw WrappedTargetException( e.Message, Reference< XInterface >(), Any() );
}
diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index cc9d250..f71c799 100644
--- a/framework/source/fwe/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -99,15 +99,15 @@ sal_Bool StatusBarConfiguration::LoadStatusBar(
xParser->parseStream( aInputSource );
return sal_True;
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
return sal_False;
}
- catch( SAXException& )
+ catch( const SAXException& )
{
return sal_False;
}
- catch( ::com::sun::star::io::IOException& )
+ catch( const ::com::sun::star::io::IOException& )
{
return sal_False;
}
@@ -128,15 +128,15 @@ sal_Bool StatusBarConfiguration::StoreStatusBar(
aWriteStatusBarDocumentHandler.WriteStatusBarDocument();
return sal_True;
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
return sal_False;
}
- catch ( SAXException& )
+ catch ( const SAXException& )
{
return sal_False;
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
return sal_False;
}
diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 039a004..9b0c0ed 100644
--- a/framework/source/fwe/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -100,15 +100,15 @@ sal_Bool ToolBoxConfiguration::LoadToolBox(
xParser->parseStream( aInputSource );
return sal_True;
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
return sal_False;
}
- catch( SAXException& )
+ catch( const SAXException& )
{
return sal_False;
}
- catch( ::com::sun::star::io::IOException& )
+ catch( const ::com::sun::star::io::IOException& )
{
return sal_False;
}
@@ -131,15 +131,15 @@ sal_Bool ToolBoxConfiguration::StoreToolBox(
aWriteToolBoxDocumentHandler.WriteToolBoxDocument();
return sal_True;
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
return sal_False;
}
- catch ( SAXException& )
+ catch ( const SAXException& )
{
return sal_False;
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
return sal_False;
}
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 0d386c7..4d77bf4 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -277,7 +277,7 @@ throw( SAXException, RuntimeException )
{
xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" )), makeAny( aUIName ) );
}
- catch ( UnknownPropertyException& )
+ catch ( const UnknownPropertyException& )
{
}
}
@@ -698,7 +698,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
{
xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName;
}
- catch ( UnknownPropertyException& )
+ catch ( const UnknownPropertyException& )
{
}
}
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index efba9c9..e1f139c 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -66,9 +66,8 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.LanguageGuessing")) ),
uno::UNO_QUERY );
}
- catch (uno::Exception &r)
+ catch (const uno::Exception &)
{
- (void) r;
DBG_ASSERT( 0, "failed to get language guessing component" );
}
}
@@ -101,7 +100,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
{
_rModuleIdentifier = xModuleManager->identify( _xFrame );
}
- catch( Exception& )
+ catch( const Exception& )
{
}
}
@@ -112,7 +111,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
xNameAccess->getByName( _rModuleIdentifier ) >>= _xUICommandLabels;
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -142,7 +141,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
aLabel = aStr;
}
}
- catch ( com::sun::star::uno::Exception& )
+ catch ( const com::sun::star::uno::Exception& )
{
}
}
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 97d290e..f39bda8 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -168,7 +168,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode )
if (eMode==E_READWRITE)
m_xConfig = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGUPDATEACCESS, lParams);
}
- catch(css::uno::Exception& ex)
+ catch(const css::uno::Exception& ex)
{
(void) ex; // avoid warning
LOG_WARNING("open config ...", U2B(ex.Message))
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 01631ef..ab61954 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -167,7 +167,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource
xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= m_aUIName;
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -213,7 +213,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource
}
}
}
- catch ( IndexOutOfBoundsException& )
+ catch ( const IndexOutOfBoundsException& )
{
}
}
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index c0332a3..6e0dce6 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -96,7 +96,7 @@ ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer,
}
}
}
- catch ( IndexOutOfBoundsException& )
+ catch ( const IndexOutOfBoundsException& )
{
}
}
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index ebad04f..6678506 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -108,7 +108,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo
xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= m_aUIName;
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -141,7 +141,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo
}
}
}
- catch ( IndexOutOfBoundsException& )
+ catch ( const IndexOutOfBoundsException& )
{
}
}
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 23ac220..5e04b93 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -318,7 +318,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa
m_bConfigListening = sal_False;
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -336,7 +336,7 @@ void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sa
m_bConfigListening = sal_True;
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -518,7 +518,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc
{
xUICfgMgr->replaceSettings( aResourceURL, m_xConfigData );
}
- catch( NoSuchElementException& )
+ catch( const NoSuchElementException& )
{
}
}
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index fa2a67a..fb06ab0 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -310,9 +310,9 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
if (xHelpContent.is())
sCurrentHelpURL = xHelpContent->getURL();
}
- catch(css::uno::RuntimeException& exRun)
+ catch(const css::uno::RuntimeException& exRun)
{ throw exRun; }
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{ sCurrentHelpURL = ::rtl::OUString(); }
return sCurrentHelpURL;
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 70fcf69..5b61cd3 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -576,7 +576,7 @@ void Job::impl_startListening()
m_bListenOnDesktop = sal_True;
}
}
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{
m_xDesktop = css::uno::Reference< css::frame::XDesktop >();
}
@@ -595,7 +595,7 @@ void Job::impl_startListening()
m_bListenOnFrame = sal_True;
}
}
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{
m_bListenOnFrame = sal_False;
}
@@ -614,7 +614,7 @@ void Job::impl_startListening()
m_bListenOnModel = sal_True;
}
}
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{
m_bListenOnModel = sal_False;
}
@@ -644,7 +644,7 @@ void Job::impl_stopListening()
m_xDesktop = css::uno::Reference< css::frame::XDesktop >();
m_bListenOnDesktop = sal_False;
}
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{
}
}
@@ -662,7 +662,7 @@ void Job::impl_stopListening()
m_bListenOnFrame = sal_False;
}
}
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{
}
}
@@ -680,7 +680,7 @@ void Job::impl_stopListening()
m_bListenOnModel = sal_False;
}
}
- catch(css::uno::Exception&)
+ catch(const css::uno::Exception&)
{
}
}
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 1ce9741..8f41143 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -156,7 +156,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
{
m_sModuleIdentifier = xModuleManager->identify( m_xFrame );
}
- catch( css::uno::Exception& )
+ catch( const css::uno::Exception& )
{}
}
}
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index e150cbb..415c4db 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -246,7 +246,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
{
aModuleIdentifier = m_xModuleManager->identify( aEvent.Source );
}
- catch( css::uno::Exception& )
+ catch( const css::uno::Exception& )
{}
// Special feature: If the events "OnNew" or "OnLoad" occures - we generate our own event "onDocumentOpened".
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 12f57da..ad4ef23 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -374,7 +374,7 @@ void impl_addWindowListeners(
xThis, css::uno::UNO_QUERY ));
xDockWindow->enableDocking( sal_True );
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 0db2c84..1598537 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -293,7 +293,7 @@ void LayoutManager::implts_reset( sal_Bool bAttached )
{
aModuleIdentifier = m_xModuleManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ) );
}
- catch( Exception& ) {}
+ catch( const Exception& ) {}
if ( aModuleIdentifier.getLength() && aOldModuleIdentifier != aModuleIdentifier )
{
@@ -2696,7 +2696,7 @@ void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam )
{
((frame::XLayoutManagerListener*)pIterator.next())->layoutEvent( aSource, nEvent, aInfoParam );
}
- catch( uno::RuntimeException& )
+ catch( const uno::RuntimeException& )
{
pIterator.remove();
}
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 57c7a7c..5f95784 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -232,7 +232,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS
css::uno::Sequence < css::uno::Any > aSeq;
css::uno::Any aNew;
try { aNew = m_xConverter->convertTo( aValue, ::getCppuType((const css::uno::Sequence < css::uno::Any >*)0) ); }
- catch (css::uno::Exception&) {}
+ catch (const css::uno::Exception&) {}
aNew >>= aSeq;
aArgumentBuffer.appendAscii("Array(");
@@ -320,8 +320,8 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, ::rtl::OUS
{
aNew = m_xConverter->convertToSimpleType( aValue, css::uno::TypeClass_STRING );
}
- catch (css::script::CannotConvertException&) {}
- catch (css::uno::Exception&) {}
+ catch (const css::script::CannotConvertException&) {}
+ catch (const css::uno::Exception&) {}
::rtl::OUString sVal;
aNew >>= sVal;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 7a057bf..9d26f63 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1637,7 +1637,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close
{
((css::util::XCloseListener*)pIterator.next())->queryClosing( aSource, bDeliverOwnerShip );
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
pIterator.remove();
}
@@ -1674,7 +1674,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close
{
((css::util::XCloseListener*)pIterator.next())->notifyClosing( aSource );
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
pIterator.remove();
}
@@ -2783,7 +2783,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction
{
((css::frame::XFrameActionListener*)aIterator.next())->frameAction( aFrameActionEvent );
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
aIterator.remove();
}
@@ -2875,7 +2875,7 @@ void Frame::implts_setIconOnWindow()
{
xSet->getPropertyValue( DECLARE_ASCII("IconId") )>>= nIcon;
}
- catch( css::beans::UnknownPropertyException& )
+ catch( const css::beans::UnknownPropertyException& )
{
}
}
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 73d1e6d..304d35b 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -367,7 +367,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
aRet <<= sal_False;
}
}
- catch (RuntimeException&)
+ catch (const RuntimeException&)
{
// license could not be verified
aRet <<= sal_False;
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 6dc4877..64c485c 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -172,7 +172,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
Sequence< PropertyValue > args(1);
args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
- } catch (com::sun::star::uno::Exception& e) {
+ } catch (const com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
OSL_FAIL(aMsg.getStr());
// save failed, but tell manager to go on if we havent yet dispatched the request
@@ -200,7 +200,7 @@ void SessionListener::QuitSessionQuietly()
Sequence< PropertyValue > args(1);
args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
- } catch (com::sun::star::uno::Exception& e) {
+ } catch (const com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
OSL_FAIL(aMsg.getStr());
}
@@ -278,7 +278,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
xDispatch->dispatch(aURL, args);
m_bRestored = sal_True;
- } catch (com::sun::star::uno::Exception& e) {
+ } catch (const com::sun::star::uno::Exception& e) {
OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
OSL_FAIL(aMsg.getStr());
}
@@ -329,7 +329,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted
m_rSessionManager->interactionDone( this );
}
}
- catch( css::uno::Exception& )
+ catch( const css::uno::Exception& )
{
StoreSession( sal_True );
m_rSessionManager->interactionDone( this );
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 28bde7e..21f5535 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -717,7 +717,7 @@ rtl::OUString SubstitutePathVariables::GetWorkPath() const
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")),
::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath;
}
- catch(RuntimeException &)
+ catch(const RuntimeException &)
{
}
@@ -742,7 +742,7 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Work")),
::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath;
}
- catch(RuntimeException &)
+ catch(const RuntimeException &)
{
}
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 3ade198..9d38c70 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -214,7 +214,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID ) co
break;
}
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
pIterator.remove();
}
@@ -242,7 +242,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con
break;
}
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
pIterator.remove();
}
@@ -318,11 +318,11 @@ throw (css::uno::Exception, css::uno::RuntimeException)
xToolkit = css::uno::Reference< css::awt::XToolkit >(
xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), css::uno::UNO_QUERY );
}
- catch ( css::uno::RuntimeException& )
+ catch ( const css::uno::RuntimeException& )
{
throw;
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
@@ -359,11 +359,11 @@ throw (css::uno::Exception, css::uno::RuntimeException)
{
xTopWindow = css::uno::Reference< css::awt::XTopWindow >( xToolkit->createWindow( aDescriptor ), css::uno::UNO_QUERY );
}
- catch ( css::uno::RuntimeException& )
+ catch ( const css::uno::RuntimeException& )
{
throw;
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index f417e80..d22e36f 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -202,10 +202,10 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl
if ( a >>= bValue )
return bValue;
}
- catch ( css::container::NoSuchElementException& )
+ catch ( const css::container::NoSuchElementException& )
{
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
@@ -248,10 +248,10 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle
return sal_True;
}
}
- catch ( css::container::NoSuchElementException& )
+ catch ( const css::container::NoSuchElementException& )
{
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
@@ -296,10 +296,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess()
return m_xConfigAccess.is();
}
- catch ( css::lang::WrappedTargetException& )
+ catch ( const css::lang::WrappedTargetException& )
{
}
- catch ( css::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 8fc4c42..47e2a9b 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -222,7 +222,7 @@ throw ( NoSuchElementException, RuntimeException)
}
}
}
- catch( Exception& )
+ catch( const Exception& )
{
sShort = ::rtl::OUString();
}
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 855bcd3..7977f8d 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -329,7 +329,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY );
return;
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -350,7 +350,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
return;
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
@@ -367,7 +367,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
return;
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
@@ -381,16 +381,16 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
}
}
}
- catch ( ::com::sun::star::embed::InvalidStorageException& )
+ catch ( const ::com::sun::star::embed::InvalidStorageException& )
{
}
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
+ catch ( const ::com::sun::star::lang::IllegalArgumentException& )
{
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
}
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+ catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
{
}
}
@@ -464,7 +464,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag
MenuConfiguration aMenuCfg( m_xServiceManager );
aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream );
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -476,7 +476,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag
{
ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings );
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -488,7 +488,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag
{
StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings );
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -685,19 +685,19 @@ void ModuleUIConfigurationManager::impl_Initialize()
if ( m_pStorageHandler[i] )
xElementTypeStorage = m_pStorageHandler[i]->getWorkingStorageUser();
}
- catch ( com::sun::star::container::NoSuchElementException& )
+ catch ( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( ::com::sun::star::embed::InvalidStorageException& )
+ catch ( const ::com::sun::star::embed::InvalidStorageException& )
{
}
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
+ catch ( const ::com::sun::star::lang::IllegalArgumentException& )
{
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
}
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+ catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
{
}
@@ -723,7 +723,7 @@ void ModuleUIConfigurationManager::impl_Initialize()
if( xNameAccess->hasByName( sName ) )
xNameAccess->getByName( sName ) >>= xElementTypeStorage;
}
- catch ( com::sun::star::container::NoSuchElementException& )
+ catch ( const com::sun::star::container::NoSuchElementException& )
{
}
@@ -794,7 +794,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u
if ( xModuleImageManager.is() )
xModuleImageManager->dispose();
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -949,7 +949,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno
impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer );
rUserElementType.bModified = sal_False;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -967,16 +967,16 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno
for ( k = 0; k < aReplaceEventNotifyContainer.size(); k++ )
implts_notifyContainerListener( aReplaceEventNotifyContainer[k], NotifyOp_Replace );
}
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
+ catch ( const ::com::sun::star::lang::IllegalArgumentException& )
{
}
- catch ( ::com::sun::star::container::NoSuchElementException& )
+ catch ( const ::com::sun::star::container::NoSuchElementException& )
{
}
- catch ( ::com::sun::star::embed::InvalidStorageException& )
+ catch ( const ::com::sun::star::embed::InvalidStorageException& )
{
}
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+ catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
{
}
}
@@ -1482,7 +1482,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un
if ( rUserElementType.bModified )
impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -1524,7 +1524,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno
m_pStorageHandler[i]->commitUserChanges();
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -1555,7 +1555,7 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt
if ( rElementType.bModified && xElementTypeStorage.is() )
impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag!
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -1604,7 +1604,7 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const Configu
break;
}
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
pIterator.remove();
}
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 98adb38..83c006b 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -258,10 +258,10 @@ sal_Bool ConfigurationAccess_UICategory::fillCache()
m_aIdCache.insert( IdToInfoCache::value_type( aNameSeq[i], aUIName ));
}
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
- catch ( com::sun::star::container::NoSuchElementException& )
+ catch ( const com::sun::star::container::NoSuchElementException& )
{
}
}
@@ -288,19 +288,19 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const rtl::OUString& rId )
{
return m_xGenericUICategories->getByName( rId );
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
- catch ( com::sun::star::container::NoSuchElementException& )
+ catch ( const com::sun::star::container::NoSuchElementException& )
{
}
}
}
}
- catch( com::sun::star::container::NoSuchElementException& )
+ catch( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
@@ -357,10 +357,10 @@ Sequence< rtl::OUString > ConfigurationAccess_UICategory::getAllIds()
return aNameSeq;
}
- catch( com::sun::star::container::NoSuchElementException& )
+ catch( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -394,10 +394,10 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
return sal_True;
}
- catch ( WrappedTargetException& )
+ catch ( const WrappedTargetException& )
{
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index fedb568..66369b8 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -267,7 +267,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType,
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY );
return;
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -288,7 +288,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType,
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
return;
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
@@ -305,7 +305,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType,
aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY );
return;
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
@@ -319,16 +319,16 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType,
}
}
}
- catch ( ::com::sun::star::embed::InvalidStorageException& )
+ catch ( const ::com::sun::star::embed::InvalidStorageException& )
{
}
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
+ catch ( const ::com::sun::star::lang::IllegalArgumentException& )
{
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
}
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+ catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
{
}
}
@@ -393,7 +393,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x
MenuConfiguration aMenuCfg( m_xServiceManager );
aMenuCfg.StoreMenuBarConfigurationToXML( rElement.xSettings, xOutputStream );
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -405,7 +405,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x
{
ToolBoxConfiguration::StoreToolBox( m_xServiceManager, xOutputStream, rElement.xSettings );
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -417,7 +417,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x
{
StatusBarConfiguration::StoreStatusBar( m_xServiceManager, xOutputStream, rElement.xSettings );
}
- catch ( ::com::sun::star::lang::WrappedTargetException& )
+ catch ( const ::com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -563,19 +563,19 @@ void UIConfigurationManager::impl_Initialize()
{
xElementTypeStorage = m_xDocConfigStorage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), nModes );
}
- catch ( com::sun::star::container::NoSuchElementException& )
+ catch ( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( ::com::sun::star::embed::InvalidStorageException& )
+ catch ( const ::com::sun::star::embed::InvalidStorageException& )
{
}
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
+ catch ( const ::com::sun::star::lang::IllegalArgumentException& )
{
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
}
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+ catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
{
}
@@ -631,7 +631,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru
if ( m_xImageManager.is() )
m_xImageManager->dispose();
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -755,16 +755,16 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt
for ( sal_uInt32 k = 0; k < aRemoveEventNotifyContainer.size(); k++ )
implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove );
}
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
+ catch ( const ::com::sun::star::lang::IllegalArgumentException& )
{
}
- catch ( ::com::sun::star::container::NoSuchElementException& )
+ catch ( const ::com::sun::star::container::NoSuchElementException& )
{
}
- catch ( ::com::sun::star::embed::InvalidStorageException& )
+ catch ( const ::com::sun::star::embed::InvalidStorageException& )
{
}
- catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+ catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
{
}
}
@@ -1142,7 +1142,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
if ( xComponent.is() )
xComponent->dispose();
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -1174,10 +1174,10 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
if ( a >>= nOpenMode )
m_bReadOnly = !( nOpenMode & ElementModes::WRITE );
}
- catch ( com::sun::star::beans::UnknownPropertyException& )
+ catch ( const com::sun::star::beans::UnknownPropertyException& )
{
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -1217,7 +1217,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc
if ( rDocElementType.bModified )
impl_reloadElementTypeData( rDocElementType, aRemoveNotifyContainer, aReplaceNotifyContainer );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -1256,7 +1256,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce
if ( rElementType.bModified && xStorage.is() )
impl_storeElementTypeData( xStorage, rElementType );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -1290,7 +1290,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage
if ( rElementType.bModified && xElementTypeStorage.is() )
impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag!
}
- catch ( Exception& )
+ catch ( const Exception& )
{
throw IOException();
}
@@ -1339,7 +1339,7 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration
break;
}
}
- catch( css::uno::RuntimeException& )
+ catch( const css::uno::RuntimeException& )
{
pIterator.remove();
}
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 221ce88..88e0a3c 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -436,7 +436,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException )
xFlush->commitChanges();
}
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -493,7 +493,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException,
xFlush->commitChanges();
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -567,7 +567,7 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException,
xFlush->commitChanges();
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -847,10 +847,10 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const rt
aPropSeq[nIndex].Value = a;
}
}
- catch( com::sun::star::container::NoSuchElementException& )
+ catch( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -1022,10 +1022,10 @@ ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowStat
DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
}
- catch( com::sun::star::container::NoSuchElementException& )
+ catch( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
}
@@ -1054,10 +1054,10 @@ Any ConfigurationAccess_WindowState::impl_getWindowStateFromResourceURL( const r
return impl_insertCacheAndReturnSequence( rResourceURL, xNameAccess );
}
}
- catch( com::sun::star::container::NoSuchElementException& )
+ catch( const com::sun::star::container::NoSuchElementException& )
{
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
}
@@ -1295,7 +1295,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
DBG_ASSERT( sal_False, "Wrong value for ConfigurationAccess_WindowState. Who has forgotten to add this new property!" );
}
}
- catch( Exception& )
+ catch( const Exception& )
{
}
}
@@ -1332,10 +1332,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
return sal_True;
}
- catch ( WrappedTargetException& )
+ catch ( const WrappedTargetException& )
{
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -1382,7 +1382,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
{
aElementNames = xNameAccess->getElementNames();
}
- catch (::com::sun::star::uno::RuntimeException &)
+ catch (const ::com::sun::star::uno::RuntimeException &)
{
}
Sequence< PropertyValue > aSeq;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index facbf5b..5d136aa 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -242,7 +242,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
aModuleIdentifier = xModuleManager->identify( m_xFrame );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -341,7 +341,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
aURL, aArgs, xComponentContext ),
UNO_QUERY );
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
bMustBeInit = sal_False; // factory called init already!
@@ -376,7 +376,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
{
xInit->initialize( aArgs );
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
}
@@ -407,7 +407,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
{
xUpdatable->update();
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
}
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 5df537b..ed6d016 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -162,7 +162,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
pToolBar->SetSizePixel( aSize );
}
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
}
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 4bedf0c..554a9e7 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -280,7 +280,7 @@ throw (::com::sun::star::uno::RuntimeException)
xDispatch->dispatch( aTargetURL, aArgs );
}
- catch ( DisposedException& )
+ catch ( const DisposedException& )
{
}
}
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 6d088b1..94b3986 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -239,7 +239,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteI
// elements if a component gets detached from its frame!
pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -264,7 +264,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*,
aEvent.aInformation = pNotifyInfo->aInfoSeq;
pNotifyInfo->xNotifyListener->controlEvent( aEvent );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 7e6c566..08db404 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -307,7 +307,7 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI
// elements if a component gets detached from its frame!
pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -327,7 +327,7 @@ MenuToolbarController::~MenuToolbarController()
if ( m_xMenuManager.is() )
m_xMenuManager->dispose();
}
- catch( Exception& ) {}
+ catch( const Exception& ) {}
if ( pMenu )
{
delete pMenu;
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index dabce89..e262a2c 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -202,7 +202,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
}
}
}
- catch ( com::sun::star::container::NoSuchElementException& )
+ catch ( const com::sun::star::container::NoSuchElementException& )
{
}
}
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 30eaa8f..7da9718 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -160,7 +160,7 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*
// elements if a component gets detached from its frame!
pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
delete pExecuteInfo;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 28c29da..1ce4776 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -389,7 +389,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
Reference< XUIConfigurationListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -401,7 +401,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
Reference< XUIConfigurationListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -676,11 +676,11 @@ void MenuBarManager::RemoveListener()
if ( xComponent.is() )
xComponent->dispose();
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
throw;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -701,7 +701,7 @@ void MenuBarManager::RemoveListener()
m_xFrame->removeFrameActionListener( Reference< XFrameActionListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -999,7 +999,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
pMenuItemHandler->xMenuItemDispatch->removeStatusListener(
static_cast< XStatusListener* >( this ), aTargetURL );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -1513,7 +1513,7 @@ void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
aMenuShortCuts[i]->aKeyCode = svt::AcceleratorExecute::st_AWTKey2VCLKey( aKeyEvent );
}
}
- catch ( IllegalArgumentException& )
+ catch ( const IllegalArgumentException& )
{
}
}
@@ -1532,7 +1532,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
{
m_aModuleIdentifier = xModuleManager->identify( m_xFrame );
}
- catch( Exception& )
+ catch( const Exception& )
{
}
}
@@ -1584,11 +1584,11 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
m_xModuleAcceleratorManager = xModuleAccelCfg;
}
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
throw;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -1654,7 +1654,7 @@ void MenuBarManager::RetrieveImageManagers()
if ( xModuleManager.is() )
m_aModuleIdentifier = xModuleManager->identify( Reference< XInterface >( m_xFrame, UNO_QUERY ) );
}
- catch( Exception& )
+ catch( const Exception& )
{
}
@@ -1810,7 +1810,7 @@ void MenuBarManager::FillMenu(
}
}
}
- catch ( IndexOutOfBoundsException& )
+ catch ( const IndexOutOfBoundsException& )
{
break;
}
@@ -1890,7 +1890,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
{
m_aModuleIdentifier = xModuleManager->identify( xFrame );
}
- catch( Exception& )
+ catch( const Exception& )
{
}
}
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 590e029..a89ca7e 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -165,7 +165,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
{
aModuleIdentifier = xModuleManager->identify( xFrame );
}
- catch( Exception& )
+ catch( const Exception& )
{
}
@@ -183,7 +183,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
MenuBarManager::FillMenuWithConfiguration( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans );
}
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
@@ -246,7 +246,7 @@ void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException )
if ( m_xConfigData.is() )
pMenuBarManager->SetItemContainer( m_xConfigData );
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
}
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 3877f19..dad7a19 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -315,7 +315,7 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
aMenuShortCuts[i] = svt::AcceleratorExecute::st_AWTKey2VCLKey( aKeyEvent );
}
}
- catch ( IllegalArgumentException& )
+ catch ( const IllegalArgumentException& )
{
}
}
@@ -524,11 +524,11 @@ void NewMenuController::impl_setPopupMenu()
}
}
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
throw;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx
index 35636d9..c1afcd4 100644
--- a/framework/source/uielement/popupmenucontroller.cxx
+++ b/framework/source/uielement/popupmenucontroller.cxx
@@ -226,7 +226,7 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro
mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
pToolBox->SetItemDown( nItemId, sal_False );
}
- catch( Exception& )
+ catch( const Exception& )
{
}
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index bc78ac6..e8fddb7 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -96,7 +96,7 @@ void ProgressBarWrapper::setStatusBar( const uno::Reference< awt::XWindow >& rSt
if ( xComponent.is() )
xComponent->dispose();
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
m_xStatusBar.clear();
@@ -319,7 +319,7 @@ throw (uno::RuntimeException)
if ( xComponent.is() )
xComponent->dispose();
}
- catch ( lang::DisposedException& )
+ catch ( const lang::DisposedException& )
{
}
}
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 0329c3f..056d4e9 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -503,7 +503,7 @@ IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRec
// elements if a component gets detached from its frame!
pLoadRecentFile->xDispatch->dispatch( pLoadRecentFile->aTargetURL, pLoadRecentFile->aArgSeq );
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index c23932c..d5cc5cd 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -231,7 +231,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException )
static_cast< ::cppu::OWeakObject *>( this ),
uno::UNO_QUERY ));
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
}
@@ -310,7 +310,7 @@ void StatusBarManager::UpdateControllers()
if ( xUpdatable.is() )
xUpdatable->update();
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
}
@@ -336,7 +336,7 @@ void StatusBarManager::RemoveControllers()
if ( xComponent.is() )
xComponent->dispose();
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
@@ -532,7 +532,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
}
}
}
- catch ( ::com::sun::star::lang::IndexOutOfBoundsException& )
+ catch ( const ::com::sun::star::lang::IndexOutOfBoundsException& )
{
break;
}
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index a105ae7..beb14e2 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -147,7 +147,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
pStatusBarManager->FillStatusBar( m_xConfigData );
}
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
}
@@ -174,7 +174,7 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException )
if ( m_xConfigData.is() )
pStatusBarManager->FillStatusBar( m_xConfigData );
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
}
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 9c06cce..a31f328 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -135,7 +135,7 @@ Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame >
{
xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
}
- catch ( UnknownPropertyException& )
+ catch ( const UnknownPropertyException& )
{
}
@@ -249,7 +249,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString&
UNO_QUERY );
xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandDescription;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -273,7 +273,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString&
}
aLabel = aStr;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -337,7 +337,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl
aToolBarArray.push_back( aToolBarInfo );
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -434,7 +434,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
}
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
@@ -685,7 +685,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
}
}
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
}
@@ -702,10 +702,10 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
{
xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RefreshContextToolbarVisibility" )), makeAny( sal_True ));
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -713,11 +713,11 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
RefreshToolbars( xFrame );
}
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
throw;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -878,7 +878,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
}
m_aModuleIdentifier = aModuleIdentifier;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
}
@@ -898,7 +898,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInf
pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
}
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index ebad6f9..d9e2790 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -199,7 +199,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
pToolBar->SetOutputSizePixel( aSize );
}
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
// No settings in our configuration manager. This means we are
// a transient toolbar which has no persistent settings.
@@ -257,7 +257,7 @@ void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::Run
if ( m_xConfigData.is() )
pToolBarManager->FillToolbar( m_xConfigData );
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
}
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index 7909c96..601bff0 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -112,11 +112,11 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext(
{
aModuleIdentifier = m_xModuleManager->identify( rFrame );
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
throw;
}
- catch ( Exception& )
+ catch ( const Exception& )
{
}
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index cc5f901..cce667a 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -250,7 +250,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData()
{
m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY );
}
- catch ( WrappedTargetException& )
+ catch ( const WrappedTargetException& )
{
}
@@ -302,10 +302,10 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData()
m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey, ControllerInfo(aService,aValue) ));
}
}
- catch ( NoSuchElementException& )
+ catch ( const NoSuchElementException& )
{
}
- catch ( WrappedTargetException& )
+ catch ( const WrappedTargetException& )
{
}
}
@@ -328,11 +328,11 @@ sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any&
if ( m_bAskValue )
xPropertySet->getPropertyValue( m_aPropValue ) >>= aValue;
}
- catch ( com::sun::star::beans::UnknownPropertyException& )
+ catch ( const com::sun::star::beans::UnknownPropertyException& )
{
return sal_False;
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
return sal_False;
}
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 8005718..4d19c33 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -320,7 +320,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
{
m_xConfigAccess.set( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY );
}
- catch ( WrappedTargetException& )
+ catch ( const WrappedTargetException& )
{
}
@@ -374,11 +374,11 @@ sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aE
xPropertySet->getPropertyValue( m_aPropModule ) >>= rModule;
xPropertySet->getPropertyValue( m_aPropFactory ) >>= rServiceSpecifier;
}
- catch ( com::sun::star::beans::UnknownPropertyException& )
+ catch ( const com::sun::star::beans::UnknownPropertyException& )
{
return sal_False;
}
- catch ( com::sun::star::lang::WrappedTargetException& )
+ catch ( const com::sun::star::lang::WrappedTargetException& )
{
return sal_False;
}
@@ -461,7 +461,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
if ( xUIElementFactory.is() )
return xUIElementFactory->createUIElement( ResourceURL, Args );
}
- catch ( UnknownModuleException& )
+ catch ( const UnknownModuleException& )
{
}
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 2dd46e6..4004737 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -173,7 +173,7 @@ throw (uno::Exception, uno::RuntimeException)
if ( xFrame.is() && xModuleManager.is() )
aModuleId = xModuleManager->identify( uno::Reference< uno::XInterface >( xFrame, uno::UNO_QUERY ) );
}
- catch ( frame::UnknownModuleException& )
+ catch ( const frame::UnknownModuleException& )
{
}
@@ -214,10 +214,10 @@ throw (uno::Exception, uno::RuntimeException)
{
xWindow = xFactory->createInstanceWithArgumentsAndContext( Arguments, Context );
}
- catch ( uno::RuntimeException& )
+ catch ( const uno::RuntimeException& )
{
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
}
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index 28e187b..738d6f2 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -104,15 +104,15 @@ sal_Bool ImagesConfiguration::LoadImages(
xParser->parseStream( aInputSource );
return sal_True;
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
return sal_False;
}
- catch( SAXException& )
+ catch( const SAXException& )
{
return sal_False;
}
- catch( ::com::sun::star::io::IOException& )
+ catch( const ::com::sun::star::io::IOException& )
{
return sal_False;
}
@@ -134,15 +134,15 @@ sal_Bool ImagesConfiguration::StoreImages(
aWriteImagesDocumentHandler.WriteImagesDocument();
return sal_True;
}
- catch ( RuntimeException& )
+ catch ( const RuntimeException& )
{
return sal_False;
}
- catch ( SAXException& )
+ catch ( const SAXException& )
{
return sal_False;
}
- catch ( ::com::sun::star::io::IOException& )
+ catch ( const ::com::sun::star::io::IOException& )
{
return sal_False;
}
More information about the Libreoffice-commits
mailing list