[Libreoffice-commits] core.git: 20 commits - accessibility/inc accessibility/source basctl/source binaryurp/source bridges/inc bridges/source bridges/test cli_ure/source codemaker/source comphelper/source configmgr/source connectivity/source connectivity/workben cppuhelper/qa cppuhelper/source cppuhelper/test cppu/source cui/source dbaccess/source desktop/source desktop/test editeng/source extensions/source forms/source fpicker/source framework/inc framework/source include/com include/comphelper include/connectivity include/cppu include/cppuhelper include/editeng include/osl include/rtl include/salhelper include/store include/svx include/toolkit include/typelib include/ucbhelper include/uno include/unotools include/vcl include/xmlreader include/xmlscript io/source jvmfwk/plugins lingucomponent/source odk/examples pyuno/source reportdesign/inc reportdesign/source sal/cpprt salhelper/source sal/rtl scripting/source sc/source sdext/source sd/inc sd/source stoc/inc stoc/source stoc/test store/source svx/source sw/source testtools/source toolkit/source ucbhelper/source ucb/source ucb/workben unodevtools/source unotools/source unoxml/source ure/source uui/source vcl/osx winaccessibility/source writerfilter/source xmloff/source xmlreader/source xmlscript/source
Noel Grandin
noel at peralex.com
Wed Jun 4 23:22:03 PDT 2014
accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx | 3
accessibility/source/extended/accessibletablistboxtable.cxx | 1
basctl/source/basicide/scriptdocument.cxx | 5
basctl/source/inc/scriptdocument.hxx | 3
binaryurp/source/bridgefactory.cxx | 1
binaryurp/source/bridgefactory.hxx | 3
bridges/inc/bridges/cpp_uno/bridge.hxx | 48 +-
bridges/inc/bridges/cpp_uno/shared/bridge.hxx | 10
bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx | 8
bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx | 4
bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 14
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 14
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 14
bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx | 14
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 14
bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 14
bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 14
bridges/source/cpp_uno/mingw_intel/except.cxx | 14
bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/mingw_x86-64/except.cxx | 14
bridges/source/cpp_uno/shared/bridge.cxx | 10
bridges/source/cpp_uno/shared/component.cxx | 10
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 6
bridges/source/cpp_uno/shared/unointerfaceproxy.cxx | 3
bridges/source/jni_uno/jni_base.h | 6
bridges/source/jni_uno/jni_bridge.cxx | 6
bridges/source/jni_uno/jni_bridge.h | 2
bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx | 1
bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 1
cli_ure/source/uno_bridge/cli_base.h | 2
cli_ure/source/uno_bridge/cli_bridge.cxx | 6
cli_ure/source/uno_bridge/cli_bridge.h | 6
codemaker/source/cppumaker/cpputype.cxx | 34 +-
comphelper/source/eventattachermgr/eventattachermgr.cxx | 4
comphelper/source/misc/accessiblecontexthelper.cxx | 4
comphelper/source/misc/accessibleeventnotifier.cxx | 8
comphelper/source/misc/listenernotification.cxx | 2
comphelper/source/property/propertycontainerhelper.cxx | 4
comphelper/source/property/propertystatecontainer.cxx | 2
configmgr/source/components.cxx | 4
configmgr/source/configurationprovider.cxx | 1
configmgr/source/configurationprovider.hxx | 3
configmgr/source/parsemanager.cxx | 4
configmgr/source/parsemanager.hxx | 5
configmgr/source/services.cxx | 1
connectivity/source/commontools/dbtools.cxx | 15
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/commontools/parameters.cxx | 10
connectivity/source/drivers/mork/MNSINIParser.hxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx | 4
connectivity/source/drivers/postgresql/pq_driver.cxx | 2
connectivity/source/inc/OColumn.hxx | 8
connectivity/source/inc/OTypeInfo.hxx | 8
connectivity/source/inc/TKeyValue.hxx | 8
connectivity/source/inc/TSkipDeletedSet.hxx | 8
connectivity/source/inc/TSortIndex.hxx | 8
connectivity/source/inc/file/fanalyzer.hxx | 8
connectivity/source/inc/file/fcode.hxx | 8
connectivity/source/inc/file/fcomp.hxx | 8
connectivity/source/simpledbt/staticdbtools_s.cxx | 9
connectivity/source/simpledbt/staticdbtools_s.hxx | 12
connectivity/workben/iniParser/main.cxx | 4
cppu/source/helper/purpenv/Proxy.hxx | 3
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 8
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2
cppu/source/threadpool/current.cxx | 14
cppu/source/threadpool/current.hxx | 2
cppu/source/typelib/static_types.cxx | 3
cppu/source/typelib/typelib.cxx | 22 -
cppu/source/uno/IdentityMapping.cxx | 9
cppu/source/uno/assign.hxx | 8
cppu/source/uno/constr.hxx | 5
cppu/source/uno/copy.hxx | 7
cppu/source/uno/data.cxx | 6
cppu/source/uno/destr.hxx | 7
cppu/source/uno/eq.hxx | 10
cppu/source/uno/lbmap.cxx | 47 --
cppu/source/uno/prim.hxx | 11
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 1
cppuhelper/source/access_control.cxx | 7
cppuhelper/source/compat.cxx | 14
cppuhelper/source/component.cxx | 4
cppuhelper/source/component_context.cxx | 16
cppuhelper/source/defaultbootstrap.cxx | 2
cppuhelper/source/exc_thrower.cxx | 2
cppuhelper/source/factory.cxx | 12
cppuhelper/source/implbase.cxx | 23 -
cppuhelper/source/implbase_ex.cxx | 25 -
cppuhelper/source/interfacecontainer.cxx | 56 +--
cppuhelper/source/macro_expander.cxx | 12
cppuhelper/source/macro_expander.hxx | 2
cppuhelper/source/propshlp.cxx | 25 -
cppuhelper/source/shlib.cxx | 2
cppuhelper/source/tdmgr.cxx | 2
cppuhelper/source/typeprovider.cxx | 17 -
cppuhelper/source/weak.cxx | 31 -
cppuhelper/test/cfg_test.cxx | 8
cppuhelper/test/testcmp/TestComponent.cxx | 7
cui/source/dialogs/colorpicker.cxx | 2
cui/source/inc/colorpicker.hxx | 3
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 10
dbaccess/source/core/dataaccess/ModelImpl.hxx | 8
dbaccess/source/core/inc/sdbcoretools.hxx | 6
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/ui/inc/indexcollection.hxx | 12
dbaccess/source/ui/misc/indexcollection.cxx | 12
desktop/source/migration/services/basicmigration.cxx | 1
desktop/source/migration/services/basicmigration.hxx | 3
desktop/source/migration/services/oo3extensionmigration.cxx | 1
desktop/source/migration/services/oo3extensionmigration.hxx | 3
desktop/source/migration/services/wordbookmigration.cxx | 1
desktop/source/migration/services/wordbookmigration.hxx | 3
desktop/test/deployment/active/active_native.cxx | 2
desktop/test/deployment/passive/passive_native.cxx | 2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 22 -
editeng/source/accessibility/AccessibleImageBullet.cxx | 8
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 12
editeng/source/uno/unotext.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 54 +--
extensions/source/abpilot/datasourcehandling.hxx | 46 +-
extensions/source/abpilot/fieldmappingimpl.cxx | 10
extensions/source/abpilot/fieldmappingimpl.hxx | 10
extensions/source/propctrlr/cellbindinghelper.cxx | 2
extensions/source/propctrlr/cellbindinghelper.hxx | 2
extensions/source/propctrlr/eformshelper.cxx | 32 -
extensions/source/propctrlr/eformshelper.hxx | 36 +-
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 8
extensions/source/propctrlr/formlinkdialog.hxx | 8
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/propcontroller.hxx | 3
extensions/source/propctrlr/propertyhandler.cxx | 2
extensions/source/propctrlr/propertyhandler.hxx | 2
extensions/source/propctrlr/pushbuttonnavigation.cxx | 14
extensions/source/propctrlr/pushbuttonnavigation.hxx | 14
extensions/source/propctrlr/stringrepresentation.cxx | 1
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/source/propctrlr/submissionhandler.hxx | 2
extensions/source/propctrlr/xsddatatypes.cxx | 14
extensions/source/propctrlr/xsddatatypes.hxx | 12
extensions/source/propctrlr/xsdvalidationhelper.cxx | 28 -
extensions/source/propctrlr/xsdvalidationhelper.hxx | 29 -
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 10
extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 10
extensions/source/update/check/updatecheck.cxx | 4
extensions/source/update/check/updatecheck.hxx | 4
forms/source/component/clickableimage.cxx | 2
forms/source/component/clickableimage.hxx | 2
forms/source/component/entrylisthelper.cxx | 2
forms/source/component/entrylisthelper.hxx | 3
forms/source/helper/controlfeatureinterception.cxx | 6
forms/source/inc/InterfaceContainer.hxx | 2
forms/source/inc/controlfeatureinterception.hxx | 6
forms/source/inc/listenercontainers.hxx | 4
forms/source/misc/InterfaceContainer.cxx | 2
forms/source/misc/listenercontainers.cxx | 2
forms/source/richtext/attributedispatcher.hxx | 4
forms/source/richtext/featuredispatcher.cxx | 2
forms/source/richtext/featuredispatcher.hxx | 2
forms/source/xforms/datatyperepository.cxx | 2
forms/source/xforms/datatyperepository.hxx | 2
fpicker/source/office/OfficeControlAccess.cxx | 4
fpicker/source/office/OfficeControlAccess.hxx | 2
fpicker/source/office/OfficeFilePicker.cxx | 2
fpicker/source/office/OfficeFilePicker.hxx | 3
fpicker/source/office/commonpicker.cxx | 4
fpicker/source/office/commonpicker.hxx | 5
framework/inc/uielement/constitemcontainer.hxx | 2
framework/source/fwi/uielement/constitemcontainer.cxx | 7
framework/source/recording/dispatchrecorder.cxx | 2
include/com/sun/star/uno/Any.h | 107 +++---
include/com/sun/star/uno/Any.hxx | 82 ++---
include/com/sun/star/uno/Reference.h | 104 +++---
include/com/sun/star/uno/Reference.hxx | 77 ++--
include/com/sun/star/uno/Sequence.h | 43 --
include/com/sun/star/uno/Sequence.hxx | 19 -
include/com/sun/star/uno/Type.h | 84 ++---
include/com/sun/star/uno/Type.hxx | 59 +--
include/com/sun/star/uno/genfunc.h | 9
include/com/sun/star/uno/genfunc.hxx | 3
include/comphelper/accessiblecontexthelper.hxx | 8
include/comphelper/accessibleeventnotifier.hxx | 8
include/comphelper/componentmodule.hxx | 2
include/comphelper/listenernotification.hxx | 22 -
include/comphelper/propertycontainerhelper.hxx | 6
include/comphelper/propertystatecontainer.hxx | 2
include/comphelper/string.hxx | 12
include/connectivity/CommonTools.hxx | 8
include/connectivity/FValue.hxx | 8
include/connectivity/dbconversion.hxx | 6
include/connectivity/dbtools.hxx | 19 -
include/connectivity/parameters.hxx | 10
include/connectivity/sqliterator.hxx | 8
include/connectivity/sqlscan.hxx | 8
include/connectivity/virtualdbtools.hxx | 12
include/cppu/EnvGuards.hxx | 2
include/cppuhelper/access_control.hxx | 24 -
include/cppuhelper/bootstrap.hxx | 7
include/cppuhelper/compbase.hxx | 4
include/cppuhelper/compbase_ex.hxx | 36 --
include/cppuhelper/component.hxx | 8
include/cppuhelper/component_context.hxx | 7
include/cppuhelper/exc_hlp.hxx | 3
include/cppuhelper/factory.hxx | 24 -
include/cppuhelper/implbase.hxx | 26 -
include/cppuhelper/implbase_ex.hxx | 29 -
include/cppuhelper/interfacecontainer.h | 112 +++---
include/cppuhelper/interfacecontainer.hxx | 10
include/cppuhelper/propshlp.hxx | 73 ++--
include/cppuhelper/proptypehlp.h | 30 -
include/cppuhelper/proptypehlp.hxx | 11
include/cppuhelper/queryinterface.hxx | 12
include/cppuhelper/shlib.hxx | 6
include/cppuhelper/typeprovider.hxx | 65 +---
include/cppuhelper/weak.hxx | 19 -
include/cppuhelper/weakagg.hxx | 8
include/cppuhelper/weakref.hxx | 28 -
include/editeng/AccessibleEditableTextPara.hxx | 22 -
include/editeng/AccessibleImageBullet.hxx | 8
include/editeng/AccessibleStaticTextBase.hxx | 6
include/editeng/unotext.hxx | 4
include/osl/thread.hxx | 8
include/rtl/bootstrap.hxx | 14
include/rtl/byteseq.h | 34 +-
include/rtl/byteseq.hxx | 16
include/rtl/strbuf.hxx | 4
include/rtl/string.hxx | 162 +++++-----
include/rtl/uri.hxx | 12
include/rtl/ustrbuf.hxx | 24 -
include/rtl/ustring.hxx | 162 ++++------
include/salhelper/dynload.hxx | 16
include/salhelper/refobj.hxx | 16
include/salhelper/simplereferenceobject.hxx | 18 -
include/store/store.hxx | 88 ++---
include/svx/AccessibleControlShape.hxx | 4
include/svx/AccessibleTextHelper.hxx | 20 -
include/svx/dbtoolsclient.hxx | 10
include/toolkit/controls/accessiblecontrolcontext.hxx | 10
include/toolkit/controls/formattedcontrol.hxx | 2
include/toolkit/controls/unocontrolmodel.hxx | 2
include/toolkit/controls/unocontrols.hxx | 2
include/toolkit/helper/formpdfexport.hxx | 2
include/typelib/typedescription.hxx | 56 +--
include/ucbhelper/fileidentifierconverter.hxx | 9
include/uno/current_context.hxx | 10
include/uno/environment.hxx | 62 +--
include/uno/mapping.hxx | 65 +---
include/unotools/sharedunocomponent.hxx | 4
include/vcl/ImageListProvider.hxx | 2
include/xmlreader/xmlreader.hxx | 5
include/xmlscript/xml_helper.hxx | 18 -
include/xmlscript/xmldlg_imexp.hxx | 12
include/xmlscript/xmllib_imexp.hxx | 12
include/xmlscript/xmlmod_imexp.hxx | 6
io/source/TextOutputStream/TextOutputStream.cxx | 2
io/source/services.hxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 13
lingucomponent/source/languageguessing/guesslang.cxx | 1
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 3
odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx | 4
odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx | 8
pyuno/source/module/pyuno.cxx | 2
pyuno/source/module/pyuno_impl.hxx | 2
reportdesign/inc/UndoActions.hxx | 12
reportdesign/inc/UndoEnv.hxx | 4
reportdesign/source/core/sdr/UndoActions.cxx | 12
reportdesign/source/core/sdr/UndoEnv.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/inc/GroupsSorting.hxx | 2
reportdesign/source/ui/inc/ReportControllerObserver.hxx | 4
reportdesign/source/ui/report/ReportControllerObserver.cxx | 4
sal/cpprt/operators_new_delete.cxx | 15
sal/rtl/bootstrap.cxx | 10
salhelper/source/simplereferenceobject.cxx | 7
sc/source/ui/unoobj/celllistsource.cxx | 4
sc/source/ui/unoobj/celllistsource.hxx | 6
sc/source/ui/unoobj/cellvaluebinding.cxx | 6
sc/source/ui/unoobj/cellvaluebinding.hxx | 9
scripting/source/basprov/basprov.cxx | 1
scripting/source/dlgprov/dlgprov.cxx | 3
scripting/source/provider/ActiveMSPList.cxx | 3
scripting/source/provider/ActiveMSPList.hxx | 9
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 3
scripting/source/provider/MasterScriptProvider.cxx | 4
scripting/source/provider/MasterScriptProviderFactory.cxx | 3
scripting/source/stringresource/stringresource.cxx | 3
scripting/source/vbaevents/eventhelper.cxx | 2
scripting/source/vbaevents/service.hxx | 12
sd/inc/helper/simplereferencecomponent.hxx | 2
sd/source/helper/simplereferencecomponent.cxx | 5
sdext/source/presenter/PresenterPane.hxx | 3
sdext/source/presenter/PresenterPaneBorderManager.cxx | 1
sdext/source/presenter/PresenterPaneBorderManager.hxx | 3
sdext/source/presenter/PresenterPaneFactory.hxx | 3
sdext/source/presenter/PresenterProtocolHandler.cxx | 1
sdext/source/presenter/PresenterProtocolHandler.hxx | 3
sdext/source/presenter/PresenterScreen.cxx | 1
sdext/source/presenter/PresenterScreen.hxx | 3
sdext/source/presenter/PresenterSpritePane.hxx | 3
sdext/source/presenter/PresenterViewFactory.hxx | 3
stoc/inc/stocservices.hxx | 15
stoc/source/invocation_adapterfactory/iafactory.cxx | 26 -
stoc/source/javavm/javavm.cxx | 1
stoc/source/security/access_controller.cxx | 70 +---
stoc/source/security/file_policy.cxx | 58 +--
stoc/source/security/lru_cache.h | 35 +-
stoc/source/security/permissions.cxx | 55 +--
stoc/source/security/permissions.h | 24 -
stoc/source/servicemanager/servicemanager.cxx | 18 -
stoc/source/typeconv/convert.cxx | 4
stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 1
stoc/source/uriproc/ExternalUriReferenceTranslator.hxx | 3
stoc/source/uriproc/UriReferenceFactory.cxx | 1
stoc/source/uriproc/UriReferenceFactory.hxx | 3
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 1
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 1
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx | 3
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 1
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx | 3
stoc/test/testregistry.cxx | 4
store/source/storbase.hxx | 4
store/source/storbios.cxx | 8
svx/source/accessibility/AccessibleControlShape.cxx | 4
svx/source/accessibility/AccessibleTextHelper.cxx | 88 ++---
svx/source/form/dbtoolsclient.cxx | 6
svx/source/form/fmcontrolbordermanager.cxx | 18 -
svx/source/form/fmcontrollayout.cxx | 2
svx/source/form/fmdocumentclassification.cxx | 4
svx/source/form/fmtextcontrolfeature.cxx | 6
svx/source/form/fmundo.cxx | 8
svx/source/form/formcontroller.cxx | 6
svx/source/form/formfeaturedispatcher.cxx | 2
svx/source/inc/fmcontrolbordermanager.hxx | 18 -
svx/source/inc/fmdocumentclassification.hxx | 4
svx/source/inc/fmtextcontrolfeature.hxx | 6
svx/source/inc/fmundo.hxx | 8
svx/source/inc/formcontroller.hxx | 6
svx/source/inc/formfeaturedispatcher.hxx | 2
svx/source/unodraw/unoshap2.cxx | 2
sw/source/core/docnode/finalthreadmanager.cxx | 1
testtools/source/bridgetest/constructors.cxx | 2
toolkit/source/controls/accessiblecontrolcontext.cxx | 8
toolkit/source/controls/formattedcontrol.cxx | 2
toolkit/source/controls/unocontrolmodel.cxx | 2
toolkit/source/controls/unocontrols.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 6
ucb/source/ucp/expand/ucpexpand.cxx | 1
ucb/source/ucp/ftp/ftpdirp.hxx | 2
ucb/source/ucp/tdoc/tdoc_storage.cxx | 2
ucb/source/ucp/tdoc/tdoc_storage.hxx | 2
ucb/source/ucp/webdav-neon/DAVSession.hxx | 4
ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 2
ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 4
ucb/source/ucp/webdav/DAVSession.hxx | 4
ucb/source/ucp/webdav/DAVSessionFactory.cxx | 2
ucb/source/ucp/webdav/DAVSessionFactory.hxx | 4
ucb/workben/cachemap/cachemapobject1.cxx | 6
ucb/workben/cachemap/cachemapobject1.hxx | 10
ucb/workben/cachemap/cachemapobject3.cxx | 8
ucb/workben/cachemap/cachemapobject3.hxx | 10
ucb/workben/cachemap/cachemapobjectcontainer2.cxx | 2
ucb/workben/cachemap/cachemapobjectcontainer2.hxx | 2
ucbhelper/source/client/fileidentifierconverter.cxx | 4
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 2
unotools/source/accessibility/accessiblestatesethelper.cxx | 4
unotools/source/ucbhelper/xtempfile.cxx | 1
unoxml/source/rdf/CBlankNode.cxx | 1
unoxml/source/rdf/CLiteral.cxx | 1
unoxml/source/rdf/CURI.cxx | 1
unoxml/source/rdf/librdf_repository.cxx | 1
ure/source/uretest/cppmain.cc | 1
ure/source/uretest/cppserver.cc | 1
ure/source/uretest/cpptest.cc | 1
uui/source/iahndl-authentication.cxx | 9
uui/source/iahndl-errorhandler.cxx | 2
uui/source/iahndl-filter.cxx | 7
uui/source/iahndl-ioexceptions.cxx | 4
uui/source/iahndl-locking.cxx | 6
uui/source/iahndl-ssl.cxx | 4
uui/source/iahndl.cxx | 24 -
uui/source/iahndl.hxx | 96 ++---
uui/source/interactionhandler.cxx | 6
uui/source/passwordcontainer.cxx | 2
uui/source/passwordcontainer.hxx | 6
uui/source/requeststringresolver.cxx | 2
uui/source/requeststringresolver.hxx | 8
vcl/osx/a11yfocuslistener.cxx | 4
vcl/osx/a11yfocuslistener.hxx | 4
winaccessibility/source/service/msaaservice_impl.cxx | 2
writerfilter/source/dmapper/ConversionHelper.cxx | 2
xmloff/source/forms/formcellbinding.cxx | 6
xmloff/source/forms/formcellbinding.hxx | 6
xmloff/source/forms/officeforms.cxx | 2
xmloff/source/forms/officeforms.hxx | 2
xmlreader/source/xmlreader.cxx | 2
xmlscript/source/inc/unoservices.hxx | 15
xmlscript/source/inc/xml_import.hxx | 3
xmlscript/source/xml_helper/xml_byteseq.cxx | 4
xmlscript/source/xml_helper/xml_element.cxx | 3
xmlscript/source/xml_helper/xml_impctx.cxx | 4
xmlscript/source/xmldlg_imexp/exp_share.hxx | 91 +----
xmlscript/source/xmldlg_imexp/imp_share.hxx | 59 ---
xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 27 -
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 8
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 8
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 2
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 2
xmlscript/source/xmllib_imexp/imp_share.hxx | 17 -
xmlscript/source/xmllib_imexp/xmllib_export.cxx | 2
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 5
xmlscript/source/xmlmod_imexp/imp_share.hxx | 10
xmlscript/source/xmlmod_imexp/xmlmod_export.cxx | 1
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 5
432 files changed, 2174 insertions(+), 2996 deletions(-)
New commits:
commit 0e507ae031768deceab236a41d1bbe9fb5123cea
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 5 08:16:59 2014 +0200
various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
index 4cbad6c..92e6fe9 100644
--- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
@@ -47,8 +47,7 @@ private:
// helpers ----------------------------------------------------------------
/** Throws an exception, if nIndex is not a valid child index. */
- void ensureValidIndex( sal_Int32 _nIndex ) const
- SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) );
+ void ensureValidIndex( sal_Int32 _nIndex ) const;
/** Returns true, if the specified row is selected. */
bool implIsRowSelected( sal_Int32 _nRow ) const;
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 67ffab2..e726dca 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -264,7 +264,6 @@ namespace accessibility
// helpers --------------------------------------------------------------------
void AccessibleTabListBoxTable::ensureValidIndex( sal_Int32 _nIndex ) const
- SAL_THROW( ( IndexOutOfBoundsException ) )
{
if ( ( _nIndex < 0 ) || ( _nIndex >= implGetCellCount() ) )
throw IndexOutOfBoundsException();
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index c7bbb9f..63cab3c 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -260,8 +260,7 @@ namespace basctl
bool allowMacros() const;
Reference< XNameContainer >
- getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const
- SAL_THROW((NoSuchElementException));
+ getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const;
bool hasLibrary( LibraryContainerType _eType, const OUString& _rLibName ) const;
Reference< XNameContainer >
getOrCreateLibrary( LibraryContainerType _eType, const OUString& _rLibName ) const;
@@ -448,7 +447,6 @@ namespace basctl
Reference< XNameContainer > ScriptDocument::Impl::getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const
- SAL_THROW((NoSuchElementException))
{
OSL_ENSURE( isValid(), "ScriptDocument::Impl::getLibrary: invalid state!" );
@@ -1231,7 +1229,6 @@ namespace basctl
Reference< XNameContainer > ScriptDocument::getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const
- SAL_THROW((NoSuchElementException))
{
return m_pImpl->getLibrary( _eType, _rLibName, _bLoadLibrary );
}
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index 22d12db..f8d03cb 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -247,8 +247,7 @@ namespace basctl
if there is no script library with the given name
*/
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
- getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const
- SAL_THROW((::com::sun::star::container::NoSuchElementException));
+ getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const;
/** creates a script or dialog library in the document, or returns an existing one
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index c397255..6b8994d 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -42,7 +42,6 @@ namespace binaryurp {
css::uno::Reference< css::uno::XInterface > BridgeFactory::static_create(
css::uno::Reference< css::uno::XComponentContext > const & xContext)
- SAL_THROW((css::uno::Exception))
{
return static_cast< cppu::OWeakObject * >(new BridgeFactory(xContext));
}
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 8607626..2083eeb 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -63,8 +63,7 @@ public:
static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
SAL_CALL static_create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
- const & xContext)
- SAL_THROW((com::sun::star::uno::Exception));
+ const & xContext);
static OUString SAL_CALL static_getImplementationName();
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index 284d44f..ebe00c2 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -145,7 +145,7 @@ class TypeDescr
public:
inline explicit TypeDescr( typelib_TypeDescriptionReference * td_ref );
- inline ~TypeDescr() SAL_THROW(())
+ inline ~TypeDescr()
{ TYPELIB_DANGER_RELEASE( m_td ); }
inline typelib_TypeDescription * get() const
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 4b1a308..279c4bb 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -177,7 +177,7 @@ namespace cli_uno
calls acquire then they must have kept an unacquired pointer which is
illegal.
*/
-void Bridge::acquire() const SAL_THROW(())
+void Bridge::acquire() const
{
if (1 == osl_atomic_increment( &m_ref ))
{
@@ -196,7 +196,7 @@ void Bridge::acquire() const SAL_THROW(())
}
}
-void Bridge::release() const SAL_THROW(())
+void Bridge::release() const
{
if (! osl_atomic_decrement( &m_ref ))
{
@@ -233,7 +233,7 @@ Bridge::Bridge(
}
-Bridge::~Bridge() SAL_THROW(())
+Bridge::~Bridge()
{
//System::GC::Collect();
(*m_uno_cli_env->release)( m_uno_cli_env );
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 1b14cd8..fc6d92e 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -64,11 +64,11 @@ struct Bridge
Mapping m_uno2cli;
bool m_registered_cli2uno;
- ~Bridge() SAL_THROW(());
+ ~Bridge();
Bridge( uno_Environment * java_env, uno_ExtEnvironment * uno_env, bool registered_java2uno );
- void acquire() const SAL_THROW(());
- void release() const SAL_THROW(());
+ void acquire() const;
+ void release() const;
void map_to_uno(
void * uno_data, System::Object^ cli_data,
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 00b2ee3..4a3e4d7 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -361,7 +361,7 @@ void CppuType::dumpGetCppuTypePostamble(FileStream & out) {
" getCppuType(SAL_UNUSED_PARAMETER ");
dumpType(out, name_);
dumpTemplateParameters(out);
- out << " const *) SAL_THROW(()) {\n";
+ out << " const *) {\n";
inc();
out << indent() << "return ::cppu::UnoType< ";
dumpType(out, name_);
@@ -565,7 +565,7 @@ void CppuType::dumpHFileContent(
out << "inline ::css::uno::Type const & SAL_CALL getCppuType(";
dumpType(out, name_, true);
dumpTemplateParameters(out);
- out << " *) SAL_THROW(());\n\n#endif\n";
+ out << " *);\n\n#endif\n";
}
void CppuType::dumpGetCppuType(FileStream & out) {
@@ -574,7 +574,7 @@ void CppuType::dumpGetCppuType(FileStream & out) {
<< ("inline ::css::uno::Type const & SAL_CALL"
" getCppuType(SAL_UNUSED_PARAMETER ");
dumpType(out, name_, true);
- out << " *) SAL_THROW(()) {\n";
+ out << " *) {\n";
inc();
out << indent()
<< ("return ::cppu::UnoType< ::css::uno::XInterface"
@@ -586,7 +586,7 @@ void CppuType::dumpGetCppuType(FileStream & out) {
<< ("inline ::css::uno::Type const & SAL_CALL"
" getCppuType(SAL_UNUSED_PARAMETER ");
dumpType(out, name_, true);
- out << " *) SAL_THROW(()) {\n";
+ out << " *) {\n";
inc();
out << indent()
<< ("return ::cppu::UnoType< ::css::uno::Exception"
@@ -1823,7 +1823,7 @@ void PlainStructType::dumpDeclaration(FileStream & out) {
}
out << " {\n";
inc();
- out << indent() << "inline " << id_ << "() SAL_THROW(());\n";
+ out << indent() << "inline " << id_ << "();\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0) {
out << "\n" << indent() << "inline " << id_ << "(";
bool first = !dumpBaseMembers(out, base, true);
@@ -1838,7 +1838,7 @@ void PlainStructType::dumpDeclaration(FileStream & out) {
out << " " << i->name << "_";
first = false;
}
- out << ") SAL_THROW(());\n";
+ out << ");\n";
}
if (!entity_->getDirectMembers().empty()) {
out << "\n";
@@ -1873,7 +1873,7 @@ void PlainStructType::dumpHxxFile(
if (codemaker::cppumaker::dumpNamespaceOpen(out, name_, false)) {
out << "\n";
}
- out << "\ninline " << id_ << "::" << id_ << "() SAL_THROW(())\n";
+ out << "\ninline " << id_ << "::" << id_ << "()\n";
inc();
OUString base(entity_->getDirectBase());
bool first = true;
@@ -1908,7 +1908,7 @@ void PlainStructType::dumpHxxFile(
out << " " << i->name << "_";
first = false;
}
- out << ") SAL_THROW(())\n";
+ out << ")\n";
inc();
first = true;
if (!base.isEmpty()) {
@@ -2202,7 +2202,7 @@ void PolyStructType::dumpDeclaration(FileStream & out) {
dumpTemplateHead(out);
out << "struct " << id_ << " {\n";
inc();
- out << indent() << "inline " << id_ << "() SAL_THROW(());\n";
+ out << indent() << "inline " << id_ << "();\n";
if (!entity_->getMembers().empty()) {
out << "\n" << indent() << "inline " << id_ << "(";
for (std::vector<
@@ -2221,7 +2221,7 @@ void PolyStructType::dumpDeclaration(FileStream & out) {
}
out << " " << i->name << "_";
}
- out << ") SAL_THROW(());\n\n";
+ out << ");\n\n";
for (std::vector<
unoidl::PolymorphicStructTypeTemplateEntity::Member >::
const_iterator i(entity_->getMembers().begin());
@@ -2254,7 +2254,7 @@ void PolyStructType::dumpHxxFile(
dumpTemplateHead(out);
out << "inline " << id_;
dumpTemplateParameters(out);
- out << "::" << id_ << "() SAL_THROW(())\n";
+ out << "::" << id_ << "()\n";
inc();
for (std::vector< unoidl::PolymorphicStructTypeTemplateEntity::Member >::
const_iterator i(entity_->getMembers().begin());
@@ -2288,7 +2288,7 @@ void PolyStructType::dumpHxxFile(
}
out << " " << i->name << "_";
}
- out << ") SAL_THROW(())\n";
+ out << ")\n";
inc();
for (std::vector<
unoidl::PolymorphicStructTypeTemplateEntity::Member >::
@@ -2320,7 +2320,7 @@ void PolyStructType::dumpHxxFile(
}
out << " " << i->name << "_";
}
- out << ") SAL_THROW(())\n" << indent() << "{\n";
+ out << ")\n" << indent() << "{\n";
inc();
out << indent() << "return " << id_;
dumpTemplateParameters(out);
@@ -2700,7 +2700,7 @@ void ExceptionType::dumpHxxFile(
if (codemaker::cppumaker::dumpNamespaceOpen(out, name_, false)) {
out << "\n";
}
- out << "\ninline " << id_ << "::" << id_ << "() SAL_THROW(())\n";
+ out << "\ninline " << id_ << "::" << id_ << "()\n";
inc();
OUString base(entity_->getDirectBase());
bool first = true;
@@ -2744,7 +2744,7 @@ void ExceptionType::dumpHxxFile(
out << " " << i->name << "_";
first = false;
}
- out << ") SAL_THROW(())\n";
+ out << ")\n";
inc();
first = true;
if (!base.isEmpty()) {
@@ -2983,7 +2983,7 @@ void ExceptionType::dumpDeclaration(FileStream & out) {
out << "\n{\npublic:\n";
inc();
out << indent() << "inline CPPU_GCC_DLLPRIVATE " << id_
- << "() SAL_THROW(());\n\n";
+ << "();\n\n";
if (!entity_->getDirectMembers().empty() || getInheritedMemberCount() > 0) {
out << indent() << "inline CPPU_GCC_DLLPRIVATE " << id_ << "(";
bool eligibleForDefaults = entity_->getDirectMembers().empty();
@@ -2999,7 +2999,7 @@ void ExceptionType::dumpDeclaration(FileStream & out) {
out << " " << i->name << "_";
first = false;
}
- out << ") SAL_THROW(());\n\n";
+ out << ");\n\n";
}
out << indent() << "inline CPPU_GCC_DLLPRIVATE " << id_ << "(" << id_
<< " const &);\n\n" << indent() << "inline CPPU_GCC_DLLPRIVATE ~"
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5cfbb5d..c9abcef 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -87,8 +87,6 @@ typedef std::list< UnresolvedListItem > UnresolvedList;
void parseXcsFile(
OUString const & url, int layer, Data & data, Partial const * partial,
Modifications * modifications, Additions * additions)
- SAL_THROW((
- css::container::NoSuchElementException, css::uno::RuntimeException))
{
assert(partial == 0 && modifications == 0 && additions == 0);
(void) partial; (void) modifications; (void) additions;
@@ -101,8 +99,6 @@ void parseXcsFile(
void parseXcuFile(
OUString const & url, int layer, Data & data, Partial const * partial,
Modifications * modifications, Additions * additions)
- SAL_THROW((
- css::container::NoSuchElementException, css::uno::RuntimeException))
{
bool ok = rtl::Reference< ParseManager >(
new ParseManager(
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 3c6df80..b9f7d9b 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -481,7 +481,6 @@ createFactory(
SAL_UNUSED_PARAMETER OUString const &,
SAL_UNUSED_PARAMETER css::uno::Sequence< OUString > const &,
SAL_UNUSED_PARAMETER rtl_ModuleCount *)
- SAL_THROW(())
{
return new Factory;
}
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index 0ffbdd3..7fbf5b7 100644
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
@@ -49,8 +49,7 @@ getSupportedServiceNames();
com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
SAL_CALL createFactory(
cppu::ComponentFactoryFunc, OUString const &,
- com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *)
- SAL_THROW(());
+ com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *);
} }
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index 10837c5..8768fcb 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,9 +35,7 @@ namespace configmgr {
ParseManager::ParseManager(
OUString const & url, rtl::Reference< Parser > const & parser)
- SAL_THROW((
- css::container::NoSuchElementException, css::uno::RuntimeException)):
- reader_(url), parser_(parser)
+ : reader_(url), parser_(parser)
{
assert(parser.is());
int id;
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 9491029..85ed3c5 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -40,10 +40,7 @@ class Parser;
class ParseManager: public salhelper::SimpleReferenceObject {
public:
ParseManager(
- OUString const & url, rtl::Reference< Parser > const & parser)
- SAL_THROW((
- com::sun::star::container::NoSuchElementException,
- com::sun::star::uno::RuntimeException));
+ OUString const & url, rtl::Reference< Parser > const & parser);
bool parse(std::set< OUString > const * existingDependencies);
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index fb667e4..7d50d97 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -41,7 +41,6 @@ namespace {
css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
const &)
- SAL_THROW((css::uno::Exception))
{
assert(false);
return css::uno::Reference< css::uno::XInterface >();
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index a44c4c0..e7e98d9 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1417,7 +1417,7 @@ OUString SAL_CALL ColorPicker_getImplementationName()
return OUString( "com.sun.star.cui.ColorPicker" );
}
-Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & xContext ) SAL_THROW( (Exception) )
+Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & xContext )
{
return static_cast<XWeak*>( new ColorPicker( xContext ) );
}
diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx
index c5fe678..c6dfeeb 100644
--- a/cui/source/inc/colorpicker.hxx
+++ b/cui/source/inc/colorpicker.hxx
@@ -39,8 +39,7 @@ namespace cui {
OUString SAL_CALL ColorPicker_getImplementationName();
css::uno::Reference<css::uno::XInterface> SAL_CALL ColorPicker_createInstance(
- css::uno::Reference<css::uno::XComponentContext> const &)
- SAL_THROW((css::uno::Exception));
+ css::uno::Reference<css::uno::XComponentContext> const &);
css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames()
throw (css::uno::RuntimeException);
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 27a9925..0dbddcb 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -162,7 +162,7 @@ namespace svt
};
- void lcl_throwIllegalArgumentException( ) SAL_THROW( (IllegalArgumentException) )
+ void lcl_throwIllegalArgumentException( )
{
throw IllegalArgumentException();
// TODO: error message in the exception
@@ -234,7 +234,7 @@ namespace svt
}
- Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const SAL_THROW( (IllegalArgumentException) )
+ Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const
{
Control* pControl = NULL;
ControlDescription tmpDesc;
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 890f860..857035e 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -91,7 +91,7 @@ namespace svt
Control* _pControl, sal_Int16 _nProperty, const ::com::sun::star::uno::Any& _rValue,
bool _bIgnoreIllegalArgument = true );
- Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const SAL_THROW( (::com::sun::star::lang::IllegalArgumentException) );
+ Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const;
/** implements the various methods for retrieving properties from controls
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 02e747a..4c1b5f8 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1082,7 +1082,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
}
-bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
+bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue )
{
if ( _rName == "TemplateDescription" )
{
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 27d9808..b49d772 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -210,8 +210,7 @@ protected:
virtual bool implHandleInitializationArgument(
const OUString& _rName,
const ::com::sun::star::uno::Any& _rValue
- )
- SAL_THROW( ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) ) SAL_OVERRIDE;
+ ) SAL_OVERRIDE;
private:
WinBits getWinBits( WinBits& rExtraBits );
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 41b1191..745c877 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -91,7 +91,7 @@ namespace svt
// XComponent related methods
- void OCommonPicker::checkAlive() const SAL_THROW( (DisposedException) )
+ void OCommonPicker::checkAlive() const
{
if ( GetBroadcastHelper().bInDispose || GetBroadcastHelper().bDisposed )
throw DisposedException();
@@ -476,7 +476,7 @@ namespace svt
}
- bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
+ bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue )
{
bool bKnown = true;
if ( _rName == "ParentWindow" )
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index b8c175e..004cdaa 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -166,7 +166,7 @@ namespace svt
// misc
- void checkAlive() const SAL_THROW( (::com::sun::star::lang::DisposedException) );
+ void checkAlive() const;
void prepareDialog();
@@ -180,8 +180,7 @@ namespace svt
virtual bool implHandleInitializationArgument(
const OUString& _rName,
const ::com::sun::star::uno::Any& _rValue
- )
- SAL_THROW( ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) );
+ );
private:
void stopWindowListening();
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index b7aec23..00ec059 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -97,7 +97,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4<
private:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
- static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW(());
+ static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties );
void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector );
com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer );
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 2622311..79a0141 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -46,7 +46,7 @@ namespace framework
*/
extern "C"
{
-static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 ) SAL_THROW(())
+static int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2 )
{
return ((OUString *)arg1)->compareTo( ((Property *)arg2)->Name );
}
@@ -58,7 +58,7 @@ class OPropertySetHelperInfo_Impl
Sequence < Property > aInfos;
public:
- OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(());
+ OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ );
// XPropertySetInfo-Methoden
virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -71,7 +71,6 @@ public:
*/
OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
IPropertyArrayHelper & rHelper_ )
- SAL_THROW(())
:aInfos( rHelper_.getProperties() )
{
}
@@ -408,7 +407,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem
}
Reference < XPropertySetInfo > ConstItemContainer::createPropertySetInfo(
- IPropertyArrayHelper & rProperties ) SAL_THROW(())
+ IPropertyArrayHelper & rProperties )
{
return static_cast< XPropertySetInfo * >( new OPropertySetHelperInfo_Impl( rProperties ) );
}
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index aeb15d5..482aa78 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -50,7 +50,6 @@ DEFINE_INIT_SERVICE(
void flatten_struct_members(
::std::vector< Any > * vec, void const * data,
typelib_CompoundTypeDescription * pTD )
- SAL_THROW(())
{
if (pTD->pBaseTypeDescription)
{
@@ -65,7 +64,6 @@ void flatten_struct_members(
Sequence< Any > make_seq_out_of_struct(
Any const & val )
- SAL_THROW( (RuntimeException) )
{
Type const & type = val.getValueType();
TypeClass eTypeClass = type.getTypeClass();
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index ca22957..67374e5 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -48,19 +48,19 @@ class SAL_WARN_UNUSED Any : public uno_Any
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW(())
+ inline static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(())
+ inline static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW(())
+ inline static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(())
+ inline static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
/** Default constructor: Any holds no value; its type is void.
*/
- inline Any() SAL_THROW(());
+ inline Any();
/** Templated ctor. Sets a copy of the given value.
@@ -75,51 +75,51 @@ public:
@param rAny another any
*/
- inline Any( const Any & rAny ) SAL_THROW(());
+ inline Any( const Any & rAny );
/** Constructor: Sets a copy of the given data.
@param pData_ value
@param rType type of value
*/
- inline Any( const void * pData_, const Type & rType ) SAL_THROW(());
+ inline Any( const void * pData_, const Type & rType );
/** Constructor: Sets a copy of the given data.
@param pData_ value
@param pTypeDescr type of value
*/
- inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(());
+ inline Any( const void * pData_, typelib_TypeDescription * pTypeDescr );
/** Constructor: Sets a copy of the given data.
@param pData_ value
@param pType type of value
*/
- inline Any( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW(());
+ inline Any( const void * pData_, typelib_TypeDescriptionReference * pType );
/** Destructor: Destructs any content and frees memory.
*/
- inline ~Any() SAL_THROW(());
+ inline ~Any();
/** Assignment operator: Sets the value of the given any.
@param rAny another any (right side)
@return this any
*/
- inline Any & SAL_CALL operator = ( const Any & rAny ) SAL_THROW(());
+ inline Any & SAL_CALL operator = ( const Any & rAny );
/** Gets the type of the set value.
@return a Type object of the set value
*/
- inline const Type & SAL_CALL getValueType() const SAL_THROW(())
+ inline const Type & SAL_CALL getValueType() const
{ return * reinterpret_cast< const Type * >( &pType ); }
/** Gets the type of the set value.
@return the unacquired type description reference of the set value
*/
- inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const SAL_THROW(())
+ inline typelib_TypeDescriptionReference * SAL_CALL getValueTypeRef() const
{ return pType; }
/** Gets the type description of the set value. Provides ownership of the type description!
@@ -127,34 +127,34 @@ public:
@param ppTypeDescr a pointer to type description pointer
*/
- inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const SAL_THROW(())
+ inline void SAL_CALL getValueTypeDescription( typelib_TypeDescription ** ppTypeDescr ) const
{ ::typelib_typedescriptionreference_getDescription( ppTypeDescr, pType ); }
/** Gets the type class of the set value.
@return the type class of the set value
*/
- inline TypeClass SAL_CALL getValueTypeClass() const SAL_THROW(())
+ inline TypeClass SAL_CALL getValueTypeClass() const
{ return (TypeClass)pType->eTypeClass; }
/** Gets the type name of the set value.
@return the type name of the set value
*/
- inline ::rtl::OUString SAL_CALL getValueTypeName() const SAL_THROW(());
+ inline ::rtl::OUString SAL_CALL getValueTypeName() const;
/** Tests if any contains a value.
@return true if any has a value, false otherwise
*/
- inline bool SAL_CALL hasValue() const SAL_THROW(())
+ inline bool SAL_CALL hasValue() const
{ return (typelib_TypeClass_VOID != pType->eTypeClass); }
/** Gets a pointer to the set value.
@return a pointer to the set value
*/
- inline const void * SAL_CALL getValue() const SAL_THROW(())
+ inline const void * SAL_CALL getValue() const
{ return pData; }
/** Provides a value of specified type, so you can easily write e.g.
@@ -178,26 +178,26 @@ public:
@param pData_ pointer to value
@param rType type of value
*/
- inline void SAL_CALL setValue( const void * pData_, const Type & rType ) SAL_THROW(());
+ inline void SAL_CALL setValue( const void * pData_, const Type & rType );
/** Sets a value. If the any already contains a value, that value will be destructed
and its memory freed.
@param pData_ pointer to value
@param pType type of value
*/
- inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType ) SAL_THROW(());
+ inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescriptionReference * pType );
/** Sets a value. If the any already contains a value, that value will be destructed
and its memory freed.
@param pData_ pointer to value
@param pTypeDescr type description of value
*/
- inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(());
+ inline void SAL_CALL setValue( const void * pData_, typelib_TypeDescription * pTypeDescr );
/** Clears this any. If the any already contains a value, that value will be destructed
and its memory freed. After this has been called, the any does not contain a value.
*/
- inline void SAL_CALL clear() SAL_THROW(());
+ inline void SAL_CALL clear();
/** Tests whether this any is extractable to a value of given type.
Widening conversion without data loss is taken into account.
@@ -205,7 +205,7 @@ public:
@param rType destination type
@return true if this any is extractable to value of given type (e.g. using >>= operator)
*/
- inline bool SAL_CALL isExtractableTo( const Type & rType ) const SAL_THROW(());
+ inline bool SAL_CALL isExtractableTo( const Type & rType ) const;
/** Tests whether this any can provide a value of specified type.
Widening conversion without data loss is taken into account.
@@ -222,14 +222,14 @@ public:
@param rAny another any (right side)
@return true if both any contains equal values
*/
- inline bool SAL_CALL operator == ( const Any & rAny ) const SAL_THROW(());
+ inline bool SAL_CALL operator == ( const Any & rAny ) const;
/** Unequality operator: compares two anys.
The values need not be of equal type, e.g. a short integer is compared to a long integer.
@param rAny another any (right side)
@return true if both any contains unequal values
*/
- inline bool SAL_CALL operator != ( const Any & rAny ) const SAL_THROW(());
+ inline bool SAL_CALL operator != ( const Any & rAny ) const;
private:
/// @cond INTERNAL
@@ -251,11 +251,11 @@ template<> bool Any::has<sal_uInt16>() const SAL_DELETED_FUNCTION;
@return an any
*/
template< class C >
-inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(());
+inline Any SAL_CALL makeAny( const C & value );
// additionally specialized for C++ bool
template<>
-inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(());
+inline Any SAL_CALL makeAny( bool const & value );
class BaseReference;
class Type;
@@ -267,12 +267,11 @@ class Type;
@param value source value (right side)
*/
template< class C >
-inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(());
+inline void SAL_CALL operator <<= ( Any & rAny, const C & value );
// additionally for C++ bool:
template<>
-inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
- SAL_THROW(());
+inline void SAL_CALL operator <<= ( Any & rAny, bool const & value );
/** Template binary >>= operator to assign a value from an any.
If the any does not contain a value that can be assigned without data loss, then this
@@ -284,7 +283,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
@return true if assignment was possible without data loss
*/
template< class C >
-inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, C & value );
/** Template equality operator: compares set value of left side any to right side value.
The values need not be of equal type, e.g. a short integer is compared to a long integer.
@@ -297,7 +296,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(());
@return true if values are equal, false otherwise
*/
template< class C >
-inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const C & value );
/** Template unequality operator: compares set value of left side any to right side value.
The values need not be of equal type, e.g. a short integer is compared to a long integer.
This operator can be implemented as template member function, if all supported compilers
@@ -309,60 +308,58 @@ inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW
@return true if values are unequal, false otherwise
*/
template< class C >
-inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(());
+inline bool SAL_CALL operator != ( const Any & rAny, const C & value );
// additional specialized >>= and == operators
// bool
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value );
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value );
template<>
-inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
- SAL_THROW(());
+inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value );
template<>
-inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
- SAL_THROW(());
+inline bool SAL_CALL operator == ( Any const & rAny, bool const & value );
// byte
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value );
// short
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value );
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value );
// long
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value );
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value );
// hyper
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value );
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value );
// float
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, float & value );
// double
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, double & value );
// string
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value );
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value );
// type
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value );
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const Type & value );
// any
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(());
+inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value );
// interface
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(());
+inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value );
}
}
@@ -378,7 +375,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value
@return type of IDL type any
*/
-inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * ) SAL_THROW(())
+inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * )
{
return ::cppu::UnoType< ::com::sun::star::uno::Any >::get();
}
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index fa36939..edb0da4 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -43,7 +43,7 @@ namespace uno
{
-inline Any::Any() SAL_THROW(())
+inline Any::Any()
{
::uno_any_construct( this, 0, 0, (uno_AcquireFunc)cpp_acquire );
}
@@ -67,37 +67,37 @@ inline Any::Any( bool value )
}
-inline Any::Any( const Any & rAny ) SAL_THROW(())
+inline Any::Any( const Any & rAny )
{
::uno_type_any_construct( this, rAny.pData, rAny.pType, (uno_AcquireFunc)cpp_acquire );
}
-inline Any::Any( const void * pData_, const Type & rType ) SAL_THROW(())
+inline Any::Any( const void * pData_, const Type & rType )
{
::uno_type_any_construct(
this, const_cast< void * >( pData_ ), rType.getTypeLibType(),
(uno_AcquireFunc)cpp_acquire );
}
-inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(())
+inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr )
{
::uno_any_construct(
this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire );
}
-inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(())
+inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ )
{
::uno_type_any_construct(
this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire );
}
-inline Any::~Any() SAL_THROW(())
+inline Any::~Any()
{
::uno_any_destruct(
this, (uno_ReleaseFunc)cpp_release );
}
-inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(())
+inline Any & Any::operator = ( const Any & rAny )
{
if (this != &rAny)
{
@@ -108,39 +108,39 @@ inline Any & Any::operator = ( const Any & rAny ) SAL_THROW(())
return *this;
}
-inline ::rtl::OUString Any::getValueTypeName() const SAL_THROW(())
+inline ::rtl::OUString Any::getValueTypeName() const
{
return ::rtl::OUString( pType->pTypeName );
}
-inline void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW(())
+inline void Any::setValue( const void * pData_, const Type & rType )
{
::uno_type_any_assign(
this, const_cast< void * >( pData_ ), rType.getTypeLibType(),
(uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release );
}
-inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW(())
+inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ )
{
::uno_type_any_assign(
this, const_cast< void * >( pData_ ), pType_,
(uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release );
}
-inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW(())
+inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr )
{
::uno_any_assign(
this, const_cast< void * >( pData_ ), pTypeDescr,
(uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release );
}
-inline void Any::clear() SAL_THROW(())
+inline void Any::clear()
{
::uno_any_clear(
this, (uno_ReleaseFunc)cpp_release );
}
-inline bool Any::isExtractableTo( const Type & rType ) const SAL_THROW(())
+inline bool Any::isExtractableTo( const Type & rType ) const
{
return ::uno_type_isAssignableFromData(
rType.getTypeLibType(), pData, pType,
@@ -163,14 +163,14 @@ template <>
bool Any::has<sal_uInt16>() const;
-inline bool Any::operator == ( const Any & rAny ) const SAL_THROW(())
+inline bool Any::operator == ( const Any & rAny ) const
{
return ::uno_type_equalData(
pData, pType, rAny.pData, rAny.pType,
(uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release );
}
-inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(())
+inline bool Any::operator != ( const Any & rAny ) const
{
return (! ::uno_type_equalData(
pData, pType, rAny.pData, rAny.pType,
@@ -179,7 +179,7 @@ inline bool Any::operator != ( const Any & rAny ) const SAL_THROW(())
template< class C >
-inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(())
+inline Any SAL_CALL makeAny( const C & value )
{
return Any( &value, ::cppu::getTypeFavourUnsigned(&value) );
}
@@ -187,7 +187,7 @@ inline Any SAL_CALL makeAny( const C & value ) SAL_THROW(())
// additionally specialized for C++ bool
template<>
-inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(())
+inline Any SAL_CALL makeAny( bool const & value )
{
const sal_Bool b = value;
return Any( &b, ::getCppuBooleanType() );
@@ -196,7 +196,7 @@ inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW(())
#ifdef RTL_FAST_STRING
template< class C1, class C2 >
-inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value ) SAL_THROW(())
+inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value )
{
const rtl::OUString str( value );
return Any( &str, ::cppu::getTypeFavourUnsigned(&str) );
@@ -204,7 +204,7 @@ inline Any SAL_CALL makeAny( const rtl::OUStringConcat< C1, C2 >& value ) SAL_TH
#endif
template< class C >
-inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(())
+inline void SAL_CALL operator <<= ( Any & rAny, const C & value )
{
const Type & rType = ::cppu::getTypeFavourUnsigned(&value);
::uno_type_any_assign(
@@ -216,7 +216,6 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW(())
template<>
inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
- SAL_THROW(())
{
sal_Bool b = value;
::uno_type_any_assign(
@@ -228,7 +227,6 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
#ifdef RTL_FAST_STRING
template< class C1, class C2 >
inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C2 >& value )
- SAL_THROW(())
{
const rtl::OUString str( value );
const Type & rType = ::cppu::getTypeFavourUnsigned(&str);
@@ -239,7 +237,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const rtl::OUStringConcat< C1, C
#endif
template< class C >
-inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, C & value )
{
const Type & rType = ::cppu::getTypeFavourUnsigned(&value);
return ::uno_type_assignData(
@@ -252,7 +250,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW(())
// bool
template<>
-inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value )
{
if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass)
{
@@ -263,7 +261,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal
}
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value )
{
return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass &&
(value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False));
@@ -272,7 +270,6 @@ inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SA
template<>
inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
- SAL_THROW(())
{
if (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN)
{
@@ -286,7 +283,6 @@ inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
template<>
inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
- SAL_THROW(())
{
return (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN &&
(value ==
@@ -297,7 +293,7 @@ inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
// byte
template<>
-inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value )
{
if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass)
{
@@ -309,7 +305,7 @@ inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal
// short
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -326,7 +322,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_TH
}
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -344,7 +340,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_T
// long
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -367,7 +363,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_TH
}
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -391,7 +387,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_T
// hyper
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -420,7 +416,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_TH
}
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -450,7 +446,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_T
// float
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, float & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -473,7 +469,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW(
// double
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, double & value )
{
switch (rAny.pType->eTypeClass)
{
@@ -505,7 +501,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW
// string
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value )
{
if (typelib_TypeClass_STRING == rAny.pType->eTypeClass)
{
@@ -516,7 +512,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value )
}
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value )
{
return (typelib_TypeClass_STRING == rAny.pType->eTypeClass &&
value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) ));
@@ -524,7 +520,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & val
// type
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value )
{
if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass)
{
@@ -535,7 +531,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW((
}
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const Type & value )
{
return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass &&
value.equals( * reinterpret_cast< const Type * >( rAny.pData ) ));
@@ -543,7 +539,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_TH
// any
template<>
-inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(())
+inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value )
{
if (&rAny != &value)
{
@@ -556,7 +552,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW(()
// interface
template<>
-inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value )
{
if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass)
{
@@ -568,7 +564,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value
// operator to compare to an any.
template< class C >
-inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW(())
+inline bool SAL_CALL operator == ( const Any & rAny, const C & value )
{
const Type & rType = ::cppu::getTypeFavourUnsigned(&value);
return ::uno_type_equalData(
@@ -579,7 +575,7 @@ inline bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW
// operator to compare to an any. may use specialized operators ==.
template< class C >
-inline bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW(())
+inline bool SAL_CALL operator != ( const Any & rAny, const C & value )
{
return (! operator == ( rAny, value ));
}
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index b1299fd..3b72193 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -64,8 +64,7 @@ protected:
@param rType interface type
@return interface of demanded type (may be null)
*/
- inline static XInterface * SAL_CALL iquery( XInterface * pInterface, const Type & rType )
- SAL_THROW( (RuntimeException) );
+ inline static XInterface * SAL_CALL iquery( XInterface * pInterface, const Type & rType );
/** Queries given interface for type rType.
Throws a RuntimeException if the demanded interface cannot be queried.
@@ -73,22 +72,21 @@ protected:
@param rType interface type
@return interface of demanded type
*/
- inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, const Type & rType )
- SAL_THROW( (RuntimeException) );
+ inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, const Type & rType );
public:
/** Gets interface pointer. This call does not acquire the interface.
@return UNacquired interface pointer
*/
- inline XInterface * SAL_CALL get() const SAL_THROW(())
+ inline XInterface * SAL_CALL get() const
{ return _pInterface; }
/** Checks if reference is null.
@return true if reference acquires an interface, i.e. true if it is not null
*/
- inline bool SAL_CALL is() const SAL_THROW(())
+ inline bool SAL_CALL is() const
{ return (0 != _pInterface); }
/** Equality operator: compares two interfaces
@@ -97,14 +95,14 @@ public:
@param pInterface another interface
@return true if both references are null or refer to the same object, false otherwise
*/
- inline bool SAL_CALL operator == ( XInterface * pInterface ) const SAL_THROW(());
+ inline bool SAL_CALL operator == ( XInterface * pInterface ) const;
/** Unequality operator: compares two interfaces
Checks if both references are null or refer to the same object.
@param pInterface another interface
@return false if both references are null or refer to the same object, true otherwise
*/
- inline bool SAL_CALL operator != ( XInterface * pInterface ) const SAL_THROW(());
+ inline bool SAL_CALL operator != ( XInterface * pInterface ) const;
/** Equality operator: compares two interfaces
Checks if both references are null or refer to the same object.
@@ -112,21 +110,21 @@ public:
@param rRef another reference
@return true if both references are null or refer to the same object, false otherwise
*/
- inline bool SAL_CALL operator == ( const BaseReference & rRef ) const SAL_THROW(());
+ inline bool SAL_CALL operator == ( const BaseReference & rRef ) const;
/** Unequality operator: compares two interfaces
Checks if both references are null or refer to the same object.
@param rRef another reference
@return false if both references are null or refer to the same object, true otherwise
*/
- inline bool SAL_CALL operator != ( const BaseReference & rRef ) const SAL_THROW(());
+ inline bool SAL_CALL operator != ( const BaseReference & rRef ) const;
/** Needed by some STL containers.
@param rRef another reference
@return true, if this reference is less than rRef
*/
- inline bool SAL_CALL operator < ( const BaseReference & rRef ) const SAL_THROW(());
+ inline bool SAL_CALL operator < ( const BaseReference & rRef ) const;
};
/** Enum defining UNO_QUERY for implicit interface query.
@@ -219,23 +217,20 @@ class Reference : public BaseReference
@param pInterface interface pointer
@return interface of demanded type (may be null)
*/
- inline static XInterface * SAL_CALL iquery( XInterface * pInterface )
- SAL_THROW( (RuntimeException) );
+ inline static XInterface * SAL_CALL iquery( XInterface * pInterface );
/** Queries given interface for type interface_type.
Throws a RuntimeException if the demanded interface cannot be queried.
@param pInterface interface pointer
@return interface of demanded type
*/
- inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface )
- SAL_THROW( (RuntimeException) );
+ inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface );
/** Returns the given interface if it is not <NULL/>, throws a RuntimeException otherwise.
@param pInterface interface pointer
@return pInterface
*/
- inline static interface_type * SAL_CALL iset_throw( interface_type * pInterface )
- SAL_THROW( (RuntimeException) );
+ inline static interface_type * SAL_CALL iset_throw( interface_type * pInterface );
/** Cast from an "interface pointer" (e.g., BaseReference::_pInterface) to a
pointer to this interface_type.
@@ -270,29 +265,29 @@ class Reference : public BaseReference
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( ::size_t nSize ) SAL_THROW(())
+ inline static void * SAL_CALL operator new ( ::size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(())
+ inline static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) SAL_THROW(())
+ inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(())
+ inline static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
/** Destructor: Releases interface if set.
*/
- inline ~Reference() SAL_THROW(());
+ inline ~Reference();
/** Default Constructor: Sets null reference.
*/
- inline Reference() SAL_THROW(());
+ inline Reference();
/** Copy constructor: Copies interface reference.
@param rRef another reference
*/
- inline Reference( const Reference< interface_type > & rRef ) SAL_THROW(());
+ inline Reference( const Reference< interface_type > & rRef );
/** Up-casting conversion constructor: Copies interface reference.
@@ -305,21 +300,20 @@ public:
template< class derived_type >
inline Reference(
const Reference< derived_type > & rRef,
- typename detail::UpCast< interface_type, derived_type >::t = 0 )
- SAL_THROW(());
+ typename detail::UpCast< interface_type, derived_type >::t = 0 );
/** Constructor: Sets given interface pointer.
@param pInterface an interface pointer
*/
- inline Reference( interface_type * pInterface ) SAL_THROW(());
+ inline Reference( interface_type * pInterface );
/** Constructor: Sets given interface pointer without acquiring it.
@param pInterface another reference
@param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors
*/
- inline Reference( interface_type * pInterface, __sal_NoAcquire dummy) SAL_THROW(());
+ inline Reference( interface_type * pInterface, __sal_NoAcquire dummy);
/** Constructor: Sets given interface pointer without acquiring it.
Deprecated, please use SAL_NO_ACQUIRE version.
@@ -327,26 +321,26 @@ public:
@param pInterface another reference
@param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors
*/
- inline Reference( interface_type * pInterface, UnoReference_NoAcquire dummy ) SAL_THROW(());
+ inline Reference( interface_type * pInterface, UnoReference_NoAcquire dummy );
/** Constructor: Queries given interface for reference interface type (interface_type).
@param rRef another reference
@param dummy UNO_QUERY to force obvious distinction to other constructors
*/
- inline Reference( const BaseReference & rRef, UnoReference_Query dummy ) SAL_THROW( (RuntimeException) );
+ inline Reference( const BaseReference & rRef, UnoReference_Query dummy );
/** Constructor: Queries given interface for reference interface type (interface_type).
@param pInterface an interface pointer
@param dummy UNO_QUERY to force obvious distinction to other constructors
*/
- inline Reference( XInterface * pInterface, UnoReference_Query dummy) SAL_THROW( (RuntimeException) );
+ inline Reference( XInterface * pInterface, UnoReference_Query dummy);
/** Constructor: Queries given any for reference interface type (interface_type).
@param rAny an any
@param dummy UNO_QUERY to force obvious distinction to other constructors
*/
- inline Reference( const Any & rAny, UnoReference_Query dummy) SAL_THROW( (RuntimeException) );
+ inline Reference( const Any & rAny, UnoReference_Query dummy);
/** Constructor: Queries given interface for reference interface type (interface_type).
Throws a RuntimeException if the demanded interface cannot be queried.
@@ -354,7 +348,7 @@ public:
@param dummy UNO_QUERY_THROW to force obvious distinction
to other constructors
*/
- inline Reference( const BaseReference & rRef, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline Reference( const BaseReference & rRef, UnoReference_QueryThrow dummy );
/** Constructor: Queries given interface for reference interface type (interface_type).
Throws a RuntimeException if the demanded interface cannot be queried.
@@ -362,7 +356,7 @@ public:
@param dummy UNO_QUERY_THROW to force obvious distinction
to other constructors
*/
- inline Reference( XInterface * pInterface, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline Reference( XInterface * pInterface, UnoReference_QueryThrow dummy );
/** Constructor: Queries given any for reference interface type (interface_type).
Throws a RuntimeException if the demanded interface cannot be queried.
@@ -370,7 +364,7 @@ public:
@param dummy UNO_QUERY_THROW to force obvious distinction
to other constructors
*/
- inline Reference( const Any & rAny, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline Reference( const Any & rAny, UnoReference_QueryThrow dummy );
/** Constructor: assigns from the given interface of the same type. Throws a RuntimeException
if the source interface is NULL.
@@ -379,7 +373,7 @@ public:
@since UDK 3.2.8
*/
- inline Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow dummy );
/** Constructor: assigns from the given interface of the same type. Throws a RuntimeException
if the source interface is NULL.
@@ -388,45 +382,45 @@ public:
@since UDK 3.2.8
*/
- inline Reference( interface_type * pInterface, UnoReference_SetThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline Reference( interface_type * pInterface, UnoReference_SetThrow dummy );
/** Cast operator to Reference< XInterface >: Reference objects are binary compatible and
any interface must be derived from com.sun.star.uno.XInterface.
This a useful direct cast possibility.
*/
- inline SAL_CALL operator const Reference< XInterface > & () const SAL_THROW(())
+ inline SAL_CALL operator const Reference< XInterface > & () const
{ return * reinterpret_cast< const Reference< XInterface > * >( this ); }
/** Dereference operator: Used to call interface methods.
@return UNacquired interface pointer
*/
- inline interface_type * SAL_CALL operator -> () const SAL_THROW(())
+ inline interface_type * SAL_CALL operator -> () const
{ return castFromXInterface(_pInterface); }
/** Gets interface pointer. This call does not acquire the interface.
@return UNacquired interface pointer
*/
- inline interface_type * SAL_CALL get() const SAL_THROW(())
+ inline interface_type * SAL_CALL get() const
{ return castFromXInterface(_pInterface); }
/** Clears reference, i.e. releases interface. Reference is null after clear() call.
*/
- inline void SAL_CALL clear() SAL_THROW(());
+ inline void SAL_CALL clear();
/** Sets the given interface. An interface already set will be released.
@param rRef another reference
@return true, if non-null interface was set
*/
- inline bool SAL_CALL set( const Reference< interface_type > & rRef ) SAL_THROW(());
+ inline bool SAL_CALL set( const Reference< interface_type > & rRef );
/** Sets the given interface. An interface already set will be released.
@param pInterface another interface
@return true, if non-null interface was set
*/
- inline bool SAL_CALL set( interface_type * pInterface ) SAL_THROW(());
+ inline bool SAL_CALL set( interface_type * pInterface );
/** Sets interface pointer without acquiring it. An interface already set will be released.
@@ -434,7 +428,7 @@ public:
@param dummy SAL_NO_ACQUIRE to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline bool SAL_CALL set( interface_type * pInterface, __sal_NoAcquire dummy) SAL_THROW(());
+ inline bool SAL_CALL set( interface_type * pInterface, __sal_NoAcquire dummy);
/** Sets interface pointer without acquiring it. An interface already set will be released.
Deprecated, please use SAL_NO_ACQUIRE version.
@@ -443,7 +437,7 @@ public:
@param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire dummy) SAL_THROW(());
+ inline bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire dummy);
/** Queries given interface for reference interface type (interface_type) and sets it.
An interface already set will be released.
@@ -452,7 +446,7 @@ public:
@param dummy UNO_QUERY to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline bool SAL_CALL set( XInterface * pInterface, UnoReference_Query dummy ) SAL_THROW( (RuntimeException) );
+ inline bool SAL_CALL set( XInterface * pInterface, UnoReference_Query dummy );
/** Queries given interface for reference interface type (interface_type) and sets it.
An interface already set will be released.
@@ -460,7 +454,7 @@ public:
@param dummy UNO_QUERY to force obvious distinction to set methods
@return true, if non-null interface was set
*/
- inline bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query dummy) SAL_THROW( (RuntimeException) );
+ inline bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query dummy);
/** Queries given any for reference interface type (interface_type)
and sets it. An interface already set will be released.
@@ -483,7 +477,7 @@ public:
@param dummy UNO_QUERY_THROW to force obvious distinction
to set methods
*/
- inline void SAL_CALL set( XInterface * pInterface, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline void SAL_CALL set( XInterface * pInterface, UnoReference_QueryThrow dummy );
/** Queries given interface for reference interface type (interface_type) and sets it.
An interface already set will be released.
Throws a RuntimeException if the demanded interface cannot be set.
@@ -492,7 +486,7 @@ public:
@param dummy UNO_QUERY_THROW to force obvious distinction
to set methods
*/
- inline void SAL_CALL set( const BaseReference & rRef, UnoReference_QueryThrow dummy ) SAL_THROW( (RuntimeException) );
+ inline void SAL_CALL set( const BaseReference & rRef, UnoReference_QueryThrow dummy );
/** Queries given any for reference interface type (interface_type) and
sets it. An interface already set will be released.
@@ -513,7 +507,7 @@ public:
@since UDK 3.2.8
*/
- inline void SAL_CALL set( interface_type * pInterface, UnoReference_SetThrow dummy) SAL_THROW( (RuntimeException) );
+ inline void SAL_CALL set( interface_type * pInterface, UnoReference_SetThrow dummy);
/** sets the given interface
An interface already set will be released.
Throws a RuntimeException if the source interface is @b NULL.
@@ -523,7 +517,7 @@ public:
@since UDK 3.2.8
*/
- inline void SAL_CALL set( const Reference< interface_type > & rRef, UnoReference_SetThrow dummy) SAL_THROW( (RuntimeException) );
+ inline void SAL_CALL set( const Reference< interface_type > & rRef, UnoReference_SetThrow dummy);
/** Assignment operator: Acquires given interface pointer and sets reference.
@@ -532,27 +526,27 @@ public:
@param pInterface an interface pointer
@return this reference
*/
- inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface ) SAL_THROW(());
+ inline Reference< interface_type > & SAL_CALL operator = ( interface_type * pInterface );
/** Assignment operator: Acquires given interface reference and sets reference.
An interface already set will be released.
@param rRef an interface reference
@return this reference
*/
- inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef ) SAL_THROW(());
+ inline Reference< interface_type > & SAL_CALL operator = ( const Reference< interface_type > & rRef );
/** Queries given interface reference for type interface_type.
@param rRef interface reference
@return interface reference of demanded type (may be null)
*/
- inline static Reference< interface_type > SAL_CALL query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) );
+ inline static Reference< interface_type > SAL_CALL query( const BaseReference & rRef );
/** Queries given interface for type interface_type.
@param pInterface interface pointer
@return interface reference of demanded type (may be null)
*/
- inline static Reference< interface_type > SAL_CALL query( XInterface * pInterface ) SAL_THROW( (RuntimeException) );
+ inline static Reference< interface_type > SAL_CALL query( XInterface * pInterface );
};
/// @cond INTERNAL
diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx
index c265502..69ea87b 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -36,7 +36,6 @@ namespace uno
inline XInterface * BaseReference::iquery(
XInterface * pInterface, const Type & rType )
- SAL_THROW( (RuntimeException) )
{
if (pInterface)
{
@@ -53,7 +52,7 @@ inline XInterface * BaseReference::iquery(
template< class interface_type >
inline XInterface * Reference< interface_type >::iquery(
- XInterface * pInterface ) SAL_THROW( (RuntimeException) )
+ XInterface * pInterface )
{
return BaseReference::iquery(pInterface, interface_type::static_type());
}
@@ -66,7 +65,6 @@ extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iset_msg(
inline XInterface * BaseReference::iquery_throw(
XInterface * pInterface, const Type & rType )
- SAL_THROW( (RuntimeException) )
{
XInterface * pQueried = iquery( pInterface, rType );
if (pQueried)
@@ -78,7 +76,7 @@ inline XInterface * BaseReference::iquery_throw(
template< class interface_type >
inline XInterface * Reference< interface_type >::iquery_throw(
- XInterface * pInterface ) SAL_THROW( (RuntimeException) )
+ XInterface * pInterface )
{
return BaseReference::iquery_throw(
pInterface, interface_type::static_type());
@@ -86,7 +84,7 @@ inline XInterface * Reference< interface_type >::iquery_throw(
template< class interface_type >
inline interface_type * Reference< interface_type >::iset_throw(
- interface_type * pInterface ) SAL_THROW( (RuntimeException) )
+ interface_type * pInterface )
{
if (pInterface)
{
@@ -100,20 +98,20 @@ inline interface_type * Reference< interface_type >::iset_throw(
template< class interface_type >
-inline Reference< interface_type >::~Reference() SAL_THROW(())
+inline Reference< interface_type >::~Reference()
{
if (_pInterface)
_pInterface->release();
}
template< class interface_type >
-inline Reference< interface_type >::Reference() SAL_THROW(())
+inline Reference< interface_type >::Reference()
{
_pInterface = 0;
}
template< class interface_type >
-inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW(())
+inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef )
{
_pInterface = rRef._pInterface;
if (_pInterface)
@@ -124,7 +122,6 @@ template< class interface_type > template< class derived_type >
inline Reference< interface_type >::Reference(
const Reference< derived_type > & rRef,
typename detail::UpCast< interface_type, derived_type >::t )
- SAL_THROW(())
{
interface_type * p = rRef.get();
_pInterface = p;
@@ -133,7 +130,7 @@ inline Reference< interface_type >::Reference(
}
template< class interface_type >
-inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW(())
+inline Reference< interface_type >::Reference( interface_type * pInterface )
{
_pInterface = castToXInterface(pInterface);
if (_pInterface)
@@ -141,70 +138,70 @@ inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL
}
template< class interface_type >
-inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(())
+inline Reference< interface_type >::Reference( interface_type * pInterface, __sal_NoAcquire )
{
_pInterface = castToXInterface(pInterface);
}
template< class interface_type >
-inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(())
+inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire )
{
_pInterface = castToXInterface(pInterface);
}
template< class interface_type >
-inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query )
{
_pInterface = iquery( rRef.get() );
}
template< class interface_type >
-inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query )
{
_pInterface = iquery( pInterface );
}
template< class interface_type >
-inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query )
{
_pInterface = (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass
? iquery( static_cast< XInterface * >( rAny.pReserved ) ) : 0);
}
template< class interface_type >
-inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow )
{
_pInterface = iquery_throw( rRef.get() );
}
template< class interface_type >
-inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow )
{
_pInterface = iquery_throw( pInterface );
}
template< class interface_type >
-inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow )
{
_pInterface = iquery_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass
? static_cast< XInterface * >( rAny.pReserved ) : 0 );
}
template< class interface_type >
-inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef, UnoReference_SetThrow )
{
_pInterface = castToXInterface( iset_throw( rRef.get() ) );
}
template< class interface_type >
-inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
+inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_SetThrow )
{
_pInterface = castToXInterface( iset_throw( pInterface ) );
}
template< class interface_type >
-inline void Reference< interface_type >::clear() SAL_THROW(())
+inline void Reference< interface_type >::clear()
{
if (_pInterface)
{
@@ -216,7 +213,7 @@ inline void Reference< interface_type >::clear() SAL_THROW(())
template< class interface_type >
inline bool Reference< interface_type >::set(
- interface_type * pInterface ) SAL_THROW(())
+ interface_type * pInterface )
{
if (pInterface)
castToXInterface(pInterface)->acquire();
@@ -229,7 +226,7 @@ inline bool Reference< interface_type >::set(
template< class interface_type >
inline bool Reference< interface_type >::set(
- interface_type * pInterface, __sal_NoAcquire ) SAL_THROW(())
+ interface_type * pInterface, __sal_NoAcquire )
{
XInterface * const pOld = _pInterface;
_pInterface = castToXInterface(pInterface);
@@ -240,7 +237,7 @@ inline bool Reference< interface_type >::set(
template< class interface_type >
inline bool Reference< interface_type >::set(
- interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW(())
+ interface_type * pInterface, UnoReference_NoAcquire )
{
return set( pInterface, SAL_NO_ACQUIRE );
}
@@ -248,21 +245,21 @@ inline bool Reference< interface_type >::set(
template< class interface_type >
inline bool Reference< interface_type >::set(
- const Reference< interface_type > & rRef ) SAL_THROW(())
+ const Reference< interface_type > & rRef )
{
return set( castFromXInterface( rRef._pInterface ) );
}
template< class interface_type >
inline bool Reference< interface_type >::set(
- XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) )
+ XInterface * pInterface, UnoReference_Query )
{
return set( castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE );
}
template< class interface_type >
inline bool Reference< interface_type >::set(
- const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) )
+ const BaseReference & rRef, UnoReference_Query )
{
return set( castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE );
}
@@ -283,14 +280,14 @@ inline bool Reference< interface_type >::set(
template< class interface_type >
inline void Reference< interface_type >::set(
- XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
+ XInterface * pInterface, UnoReference_QueryThrow )
{
set( castFromXInterface(iquery_throw( pInterface )), SAL_NO_ACQUIRE );
}
template< class interface_type >
inline void Reference< interface_type >::set(
- const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) )
+ const BaseReference & rRef, UnoReference_QueryThrow )
{
set( castFromXInterface(iquery_throw( rRef.get() )), SAL_NO_ACQUIRE );
}
@@ -309,14 +306,14 @@ inline void Reference< interface_type >::set(
template< class interface_type >
inline void Reference< interface_type >::set(
- interface_type * pInterface, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
+ interface_type * pInterface, UnoReference_SetThrow )
{
set( iset_throw( pInterface ), SAL_NO_ACQUIRE );
}
template< class interface_type >
inline void Reference< interface_type >::set(
- const Reference< interface_type > & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
+ const Reference< interface_type > & rRef, UnoReference_SetThrow )
{
set( rRef.get(), UNO_SET_THROW );
}
@@ -324,7 +321,7 @@ inline void Reference< interface_type >::set(
template< class interface_type >
inline Reference< interface_type > & Reference< interface_type >::operator = (
- interface_type * pInterface ) SAL_THROW(())
+ interface_type * pInterface )
{
set( pInterface );
return *this;
@@ -332,7 +329,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = (
template< class interface_type >
inline Reference< interface_type > & Reference< interface_type >::operator = (
- const Reference< interface_type > & rRef ) SAL_THROW(())
+ const Reference< interface_type > & rRef )
{
set( castFromXInterface( rRef._pInterface ) );
return *this;
@@ -341,7 +338,7 @@ inline Reference< interface_type > & Reference< interface_type >::operator = (
template< class interface_type >
inline Reference< interface_type > Reference< interface_type >::query(
- const BaseReference & rRef ) SAL_THROW( (RuntimeException) )
+ const BaseReference & rRef )
{
return Reference< interface_type >(
castFromXInterface(iquery( rRef.get() )), SAL_NO_ACQUIRE );
@@ -349,7 +346,7 @@ inline Reference< interface_type > Reference< interface_type >::query(
template< class interface_type >
inline Reference< interface_type > Reference< interface_type >::query(
- XInterface * pInterface ) SAL_THROW( (RuntimeException) )
+ XInterface * pInterface )
{
return Reference< interface_type >(
castFromXInterface(iquery( pInterface )), SAL_NO_ACQUIRE );
@@ -358,7 +355,7 @@ inline Reference< interface_type > Reference< interface_type >::query(
-inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THROW(())
+inline bool BaseReference::operator == ( XInterface * pInterface ) const
{
if (_pInterface == pInterface)
return true;
@@ -377,7 +374,7 @@ inline bool BaseReference::operator == ( XInterface * pInterface ) const SAL_THR
inline bool BaseReference::operator < (
- const BaseReference & rRef ) const SAL_THROW(())
+ const BaseReference & rRef ) const
{
if (_pInterface == rRef._pInterface)
return false;
@@ -395,17 +392,17 @@ inline bool BaseReference::operator < (
}
-inline bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW(())
+inline bool BaseReference::operator != ( XInterface * pInterface ) const
{
return (! operator == ( pInterface ));
}
-inline bool BaseReference::operator == ( const BaseReference & rRef ) const SAL_THROW(())
+inline bool BaseReference::operator == ( const BaseReference & rRef ) const
{
return operator == ( rRef._pInterface );
}
-inline bool BaseReference::operator != ( const BaseReference & rRef ) const SAL_THROW(())
+inline bool BaseReference::operator != ( const BaseReference & rRef ) const
{
return (! operator == ( rRef._pInterface ));
}
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index 92bcf8a..fa2aa96 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -59,16 +59,12 @@ public:
// these are here to force memory de/allocation to sal lib.
inline static void * SAL_CALL operator new ( ::size_t nSize )
- SAL_THROW(())
{ return ::rtl_allocateMemory( nSize ); }
inline static void SAL_CALL operator delete ( void * pMem )
- SAL_THROW(())
{ ::rtl_freeMemory( pMem ); }
inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
- SAL_THROW(())
{ return pMem; }
inline static void SAL_CALL operator delete ( void *, void * )
- SAL_THROW(())
{}
/** Static pointer to typelib type of sequence.
@@ -84,13 +80,13 @@ public:
/** Default constructor: Creates an empty sequence.
*/
- inline Sequence() SAL_THROW(());
+ inline Sequence();
/** Copy constructor: Creates a copy of given sequence.
@param rSeq another sequence of same type
*/
- inline Sequence( const Sequence< E > & rSeq ) SAL_THROW(());
+ inline Sequence( const Sequence< E > & rSeq );
/** Constructor: Takes over ownership of given sequence.
@@ -98,8 +94,7 @@ public:
@param dummy SAL_NO_ACQUIRE to force obvious distinction to other
constructors
*/
- inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire dummy )
- SAL_THROW(());
+ inline Sequence( uno_Sequence * pSequence, __sal_NoAcquire dummy );
/** Constructor: Creates a copy of given elements.
@@ -117,7 +112,7 @@ public:
/** Destructor: Releases sequence handle. Last handle will destruct
elements and free memory.
*/
- inline ~Sequence() SAL_THROW(());
+ inline ~Sequence();
/** Assignment operator: Acquires given sequence handle and releases
previously set handle.
@@ -125,14 +120,13 @@ public:
@param rSeq another sequence of same type
@return this sequence
*/
- inline Sequence< E > & SAL_CALL operator = ( const Sequence< E > & rSeq )
- SAL_THROW(());
+ inline Sequence< E > & SAL_CALL operator = ( const Sequence< E > & rSeq );
/** Gets length of the sequence.
@return length of sequence
*/
- inline sal_Int32 SAL_CALL getLength() const SAL_THROW(())
+ inline sal_Int32 SAL_CALL getLength() const
{ return _pSequence->nElements; }
/** Tests whether the sequence has elements, i.e. elements count is
@@ -140,7 +134,7 @@ public:
@return true, if elements count is greater than zero
*/
- inline bool SAL_CALL hasElements() const SAL_THROW(())
+ inline bool SAL_CALL hasElements() const
{ return (_pSequence->nElements > 0); }
/** Gets a pointer to elements array for reading.
@@ -149,7 +143,7 @@ public:
@return pointer to elements array
*/
- inline const E * SAL_CALL getConstArray() const SAL_THROW(())
+ inline const E * SAL_CALL getConstArray() const
{ return reinterpret_cast< const E * >( _pSequence->elements ); }
/** Gets a pointer to elements array for reading and writing.
@@ -209,24 +203,21 @@ public:
@param nIndex index
@return const C++ reference to element
*/
- inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const
- SAL_THROW(());
+ inline const E & SAL_CALL operator [] ( sal_Int32 nIndex ) const;
/** Equality operator: Compares two sequences.
@param rSeq another sequence of same type (right side)
@return true if both sequences are equal, false otherwise
*/
- inline bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const
- SAL_THROW(());
+ inline bool SAL_CALL operator == ( const Sequence< E > & rSeq ) const;
/** Unequality operator: Compares two sequences.
@param rSeq another sequence of same type (right side)
@return false if both sequences are equal, true otherwise
*/
- inline bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const
- SAL_THROW(());
+ inline bool SAL_CALL operator != ( const Sequence< E > & rSeq ) const;
/** Reallocates sequence to new length.
If the new length is smaller than the former, then upper elements will
@@ -244,7 +235,7 @@ public:
@return UNacquired sequence handle
*/
- inline uno_Sequence * SAL_CALL get() const SAL_THROW(())
+ inline uno_Sequence * SAL_CALL get() const
{ return _pSequence; }
};
@@ -260,7 +251,7 @@ template<> class Sequence<bool> {
@return a UNO byte sequence
*/
inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
- const ::rtl::ByteSequence & rByteSequence ) SAL_THROW(());
+ const ::rtl::ByteSequence & rByteSequence );
}
}
@@ -279,8 +270,7 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
*/
template< class E >
inline const ::com::sun::star::uno::Type &
-SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * )
- SAL_THROW(());
+SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * );
/** Gets the meta type of IDL sequence.
This function has been introduced, because one cannot get the (templated)
@@ -294,8 +284,7 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * )
*/
template< class E >
inline const ::com::sun::star::uno::Type &
-SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
- SAL_THROW(());
+SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType );
/** Gets the meta type of IDL sequence< char >.
This function has been introduced due to ambiguities with unsigned short.
@@ -305,7 +294,7 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
@return type of IDL sequence< char >
*/
inline const ::com::sun::star::uno::Type &
-SAL_CALL getCharSequenceCppuType() SAL_THROW(());
+SAL_CALL getCharSequenceCppuType();
#endif
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx
index 347953c..ba3b8c1 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -45,7 +45,7 @@ typelib_TypeDescriptionReference * Sequence< E >::s_pType = 0;
/// @endcond
template< class E >
-inline Sequence< E >::Sequence() SAL_THROW(())
+inline Sequence< E >::Sequence()
{
const Type & rType = ::cppu::getTypeFavourUnsigned( this );
::uno_type_sequence_construct(
@@ -55,7 +55,7 @@ inline Sequence< E >::Sequence() SAL_THROW(())
}
template< class E >
-inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW(())
+inline Sequence< E >::Sequence( const Sequence< E > & rSeq )
{
osl_atomic_increment( &rSeq._pSequence->nRefCount );
_pSequence = rSeq._pSequence;
@@ -63,7 +63,7 @@ inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW(())
template< class E >
inline Sequence< E >::Sequence(
- uno_Sequence * pSequence, __sal_NoAcquire ) SAL_THROW(())
+ uno_Sequence * pSequence, __sal_NoAcquire )
: _pSequence( pSequence )
{
}
@@ -93,7 +93,7 @@ inline Sequence< E >::Sequence( sal_Int32 len )
}
template< class E >
-inline Sequence< E >::~Sequence() SAL_THROW(())
+inline Sequence< E >::~Sequence()
{
const Type & rType = ::cppu::getTypeFavourUnsigned( this );
::uno_type_destructData(
@@ -101,7 +101,7 @@ inline Sequence< E >::~Sequence() SAL_THROW(())
}
template< class E >
-inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq ) SAL_THROW(())
+inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq )
{
const Type & rType = ::cppu::getTypeFavourUnsigned( this );
::uno_type_sequence_assign(
@@ -111,7 +111,6 @@ inline Sequence< E > & Sequence< E >::operator = ( const Sequence< E > & rSeq )
template< class E >
inline bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const
- SAL_THROW(())
{
if (_pSequence == rSeq._pSequence)
return true;
@@ -125,7 +124,6 @@ inline bool Sequence< E >::operator == ( const Sequence< E > & rSeq ) const
template< class E >
inline bool Sequence< E >::operator != ( const Sequence< E > & rSeq ) const
- SAL_THROW(())
{
return (! operator == ( rSeq ));
}
@@ -163,7 +161,6 @@ inline E & Sequence< E >::operator [] ( sal_Int32 nIndex )
template< class E >
inline const E & Sequence< E >::operator [] ( sal_Int32 nIndex ) const
- SAL_THROW(())
{
// silence spurious -Werror=strict-overflow warnings from GCC 4.8.2
assert(nIndex >= 0 && static_cast<sal_uInt32>(nIndex) < static_cast<sal_uInt32>(getLength()));
@@ -183,7 +180,7 @@ inline void Sequence< E >::realloc( sal_Int32 nSize )
}
inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
- const ::rtl::ByteSequence & rByteSequence ) SAL_THROW(())
+ const ::rtl::ByteSequence & rByteSequence )
{
return ::com::sun::star::uno::Sequence< sal_Int8 >(
* reinterpret_cast< const ::com::sun::star::uno::Sequence< sal_Int8 > * >( &rByteSequence ) );
@@ -239,7 +236,6 @@ template< class E >
inline const ::com::sun::star::uno::Type &
SAL_CALL getCppuType(
SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Sequence< E > * )
- SAL_THROW(())
{
return ::cppu::getTypeFavourUnsigned(
static_cast< ::com::sun::star::uno::Sequence< E > * >(0));
@@ -249,7 +245,6 @@ SAL_CALL getCppuType(
template< class E >
inline const ::com::sun::star::uno::Type &
SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
- SAL_THROW(())
{
if (! ::com::sun::star::uno::Sequence< E >::s_pType)
{
@@ -263,7 +258,7 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
// char sequence
inline const ::com::sun::star::uno::Type &
-SAL_CALL getCharSequenceCppuType() SAL_THROW(())
+SAL_CALL getCharSequenceCppuType()
{
static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0;
if (! s_pType_com_sun_star_uno_Sequence_Char)
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 1b3775f..eb35313 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -61,39 +61,39 @@ class SAL_WARN_UNUSED Type
public:
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
- inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW(())
+ inline static void * SAL_CALL operator new ( size_t nSize )
{ return ::rtl_allocateMemory( nSize ); }
- inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW(())
+ inline static void SAL_CALL operator delete ( void * pMem )
{ ::rtl_freeMemory( pMem ); }
- inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW(())
+ inline static void * SAL_CALL operator new ( size_t, void * pMem )
{ return pMem; }
- inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW(())
+ inline static void SAL_CALL operator delete ( void *, void * )
{}
/// @endcond
/** Default Constructor: Type is set to void.
*/
- inline Type() SAL_THROW(());
+ inline Type();
/** Constructor: Type is constructed by given name and type class.
@param eTypeClass type class of type
@param rTypeName name of type
*/
- inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW(());
+ inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName );
/** Constructor: Type is constructed by given name and type class.
@param eTypeClass type class of type
@param pTypeName name of type
*/
- inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW(());
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list