[Libreoffice-commits] core.git: 2 commits - basctl/source basic/source binaryurp/source bridges/source canvas/source cli_ure/source codemaker/source comphelper/source configmgr/source connectivity/source cppuhelper/source cppuhelper/test cppu/source cpputools/source cui/source desktop/source extensions/source filter/source fpicker/source framework/source include/com include/vbahelper io/source javaunohelper/source jvmaccess/source oox/source package/source pyuno/source remotebridges/source scripting/source sc/source sd/source sfx2/source slideshow/source stoc/source svl/source sw/source testtools/source ucb/source unotest/source ure/source uui/source vbahelper/source vcl/source writerfilter/source xmlhelp/source xmloff/source xmlreader/source xmlscript/source xmlscript/test xmlsecurity/source
Noel Grandin
noel at peralex.com
Fri May 23 06:06:30 PDT 2014
basctl/source/basicide/unomodel.cxx | 2
basic/source/classes/errobject.cxx | 2
basic/source/classes/sbunoobj.cxx | 6
basic/source/classes/sbxmod.cxx | 2
basic/source/uno/namecont.cxx | 2
binaryurp/source/bridge.cxx | 24
binaryurp/source/currentcontext.cxx | 8
binaryurp/source/incomingrequest.cxx | 7
binaryurp/source/marshal.cxx | 3
binaryurp/source/outgoingrequests.cxx | 3
binaryurp/source/proxy.cxx | 5
binaryurp/source/reader.cxx | 57 -
binaryurp/source/unmarshal.cxx | 61 -
binaryurp/source/writer.cxx | 7
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 58 -
bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 13
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_sparc/except.cxx | 13
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 14
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 8
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 14
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 14
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 7
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/except.cxx | 14
bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx | 8
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 9
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 9
bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx | 8
canvas/source/tools/propertysethelper.cxx | 6
cli_ure/source/climaker/climaker_app.cxx | 12
cli_ure/source/climaker/climaker_emit.cxx | 9
codemaker/source/cppumaker/cpputype.cxx | 31
comphelper/source/misc/configurationhelper.cxx | 9
comphelper/source/misc/sequenceashashmap.cxx | 12
comphelper/source/processfactory/processfactory.cxx | 3
configmgr/source/components.cxx | 66 --
configmgr/source/data.cxx | 32
configmgr/source/node.cxx | 3
configmgr/source/partial.cxx | 3
configmgr/source/type.cxx | 8
configmgr/source/valueparser.cxx | 21
configmgr/source/winreg.cxx | 3
configmgr/source/writemodfile.cxx | 17
configmgr/source/xcdparser.cxx | 9
configmgr/source/xcsparser.cxx | 49 -
configmgr/source/xcuparser.cxx | 140 +---
configmgr/source/xmldata.cxx | 9
connectivity/source/drivers/postgresql/pq_connection.cxx | 6
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 5
connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx | 5
cppu/source/threadpool/thread.cxx | 4
cppuhelper/source/access_control.cxx | 9
cppuhelper/source/component.cxx | 5
cppuhelper/source/defaultbootstrap.cxx | 6
cppuhelper/source/exc_thrower.cxx | 19
cppuhelper/source/implbase.cxx | 4
cppuhelper/source/implbase_ex.cxx | 6
cppuhelper/source/paths.cxx | 9
cppuhelper/source/propertysetmixin.cxx | 14
cppuhelper/source/servicemanager.cxx | 136 +---
cppuhelper/test/testcmp/TestComponent.cxx | 3
cpputools/source/unoexe/unoexe.cxx | 42 -
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/selector.cxx | 2
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 3
desktop/source/deployment/misc/dp_misc.cxx | 3
desktop/source/deployment/registry/help/dp_help.cxx | 4
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 3
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 5
extensions/source/ole/oleobjw.cxx | 112 +--
extensions/source/resource/ResourceIndexAccess.cxx | 20
extensions/source/update/check/updateprotocol.cxx | 3
extensions/source/update/ui/updatecheckui.cxx | 3
filter/source/msfilter/msvbahelper.cxx | 2
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 12
framework/source/accelerators/acceleratorcache.cxx | 6
framework/source/accelerators/presethandler.cxx | 3
framework/source/fwi/threadhelp/transactionmanager.cxx | 4
framework/source/recording/dispatchrecorder.cxx | 16
include/com/sun/star/uno/Any.hxx | 3
include/vbahelper/vbacollectionimpl.hxx | 14
io/source/TextOutputStream/TextOutputStream.cxx | 4
io/source/acceptor/acc_pipe.cxx | 6
io/source/acceptor/acc_socket.cxx | 12
io/source/acceptor/acceptor.cxx | 6
io/source/connector/connector.cxx | 9
javaunohelper/source/bootstrap.cxx | 10
javaunohelper/source/vm.cxx | 4
jvmaccess/source/classpath.cxx | 6
oox/source/docprop/ooxmldocpropimport.cxx | 2
oox/source/helper/textinputstream.cxx | 2
package/source/manifest/ManifestExport.cxx | 8
package/source/manifest/ManifestWriter.cxx | 2
package/source/xstor/owriteablestream.cxx | 6
package/source/xstor/xstorage.cxx | 452 ++++++--------
package/source/zipapi/ByteGrabber.cxx | 6
package/source/zipapi/XUnbufferedStream.cxx | 20
package/source/zipapi/ZipFile.cxx | 79 +-
package/source/zipapi/ZipOutputStream.cxx | 13
package/source/zipapi/blowfishcontext.cxx | 9
package/source/zipapi/sha1context.cxx | 3
package/source/zippackage/ZipPackage.cxx | 44 -
package/source/zippackage/ZipPackageEntry.cxx | 4
package/source/zippackage/ZipPackageFolder.cxx | 18
package/source/zippackage/ZipPackageFolderEnumeration.cxx | 2
package/source/zippackage/ZipPackageStream.cxx | 56 -
package/source/zippackage/wrapstreamforshare.cxx | 18
package/source/zippackage/zipfileaccess.cxx | 48 -
pyuno/source/loader/pyuno_loader.cxx | 8
pyuno/source/module/pyuno.cxx | 6
pyuno/source/module/pyuno_adapter.cxx | 13
pyuno/source/module/pyuno_except.cxx | 4
pyuno/source/module/pyuno_module.cxx | 16
pyuno/source/module/pyuno_runtime.cxx | 62 -
pyuno/source/module/pyuno_type.cxx | 24
pyuno/source/module/pyuno_util.cxx | 2
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 2
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 3
sc/source/ui/unoobj/linkuno.cxx | 15
sc/source/ui/unoobj/servuno.cxx | 2
sc/source/ui/vba/excelvbahelper.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 28
sc/source/ui/vba/vbaaxes.cxx | 4
sc/source/ui/vba/vbaaxis.cxx | 2
sc/source/ui/vba/vbaborders.cxx | 14
sc/source/ui/vba/vbacharacters.cxx | 2
sc/source/ui/vba/vbachartobjects.cxx | 4
sc/source/ui/vba/vbacomment.cxx | 2
sc/source/ui/vba/vbafont.cxx | 15
sc/source/ui/vba/vbaformat.cxx | 2
sc/source/ui/vba/vbaglobals.cxx | 3
sc/source/ui/vba/vbahelper.cxx | 8
sc/source/ui/vba/vbahyperlink.cxx | 2
sc/source/ui/vba/vbahyperlinks.cxx | 2
sc/source/ui/vba/vbainterior.cxx | 6
sc/source/ui/vba/vbamenubars.cxx | 2
sc/source/ui/vba/vbanames.cxx | 7
sc/source/ui/vba/vbapalette.cxx | 2
sc/source/ui/vba/vbapane.cxx | 10
sc/source/ui/vba/vbarange.cxx | 122 +--
sc/source/ui/vba/vbatextboxshape.cxx | 2
sc/source/ui/vba/vbavalidation.cxx | 10
sc/source/ui/vba/vbawindow.cxx | 10
sc/source/ui/vba/vbaworkbooks.cxx | 8
sc/source/ui/vba/vbaworksheet.cxx | 6
sc/source/ui/vba/vbaworksheets.cxx | 4
scripting/source/basprov/basmethnode.cxx | 6
scripting/source/basprov/basprov.cxx | 3
scripting/source/dlgprov/dlgprov.cxx | 10
scripting/source/protocolhandler/scripthandler.cxx | 6
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2
scripting/source/provider/MasterScriptProvider.cxx | 45 -
scripting/source/provider/ProviderCache.cxx | 4
scripting/source/provider/ScriptImpl.cxx | 6
scripting/source/provider/URIHelper.cxx | 12
scripting/source/stringresource/stringresource.cxx | 19
scripting/source/vbaevents/eventhelper.cxx | 6
sd/source/core/stlsheet.cxx | 2
sfx2/source/appl/openuriexternally.cxx | 6
sfx2/source/doc/sfxbasemodel.cxx | 12
slideshow/source/engine/shapes/viewmediashape.cxx | 4
slideshow/source/engine/soundplayer.cxx | 4
stoc/source/corereflection/crefl.cxx | 2
stoc/source/defaultregistry/defaultregistry.cxx | 9
stoc/source/implementationregistration/implreg.cxx | 29
stoc/source/implementationregistration/mergekeys.cxx | 13
stoc/source/invocation/invocation.cxx | 15
stoc/source/invocation_adapterfactory/iafactory.cxx | 15
stoc/source/javaloader/javaloader.cxx | 62 -
stoc/source/javavm/javavm.cxx | 2
stoc/source/security/file_policy.cxx | 4
stoc/source/security/permissions.cxx | 6
stoc/source/servicemanager/servicemanager.cxx | 12
svl/source/passwordcontainer/passwordcontainer.cxx | 4
sw/source/core/unocore/unotext.cxx | 2
sw/source/ui/vba/vbaaddin.cxx | 2
sw/source/ui/vba/vbaautotextentry.cxx | 2
sw/source/ui/vba/vbabookmark.cxx | 2
sw/source/ui/vba/vbaborders.cxx | 4
sw/source/ui/vba/vbacheckbox.cxx | 3
sw/source/ui/vba/vbacolumns.cxx | 4
sw/source/ui/vba/vbadocumentproperties.cxx | 3
sw/source/ui/vba/vbafield.cxx | 4
sw/source/ui/vba/vbafind.cxx | 6
sw/source/ui/vba/vbalistformat.cxx | 2
sw/source/ui/vba/vbalistgalleries.cxx | 2
sw/source/ui/vba/vbalistlevel.cxx | 8
sw/source/ui/vba/vbalistlevels.cxx | 2
sw/source/ui/vba/vbalisttemplates.cxx | 2
sw/source/ui/vba/vbaparagraphformat.cxx | 2
sw/source/ui/vba/vbarange.cxx | 4
sw/source/ui/vba/vbarows.cxx | 9
sw/source/ui/vba/vbasections.cxx | 2
sw/source/ui/vba/vbaselection.cxx | 24
sw/source/ui/vba/vbastyles.cxx | 4
sw/source/ui/vba/vbasystem.cxx | 6
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/vba/vbavariable.cxx | 2
sw/source/ui/vba/vbawindow.cxx | 2
sw/source/ui/vba/wordvbahelper.cxx | 2
testtools/source/bridgetest/bridgetest.cxx | 29
testtools/source/performance/ubtest.cxx | 22
ucb/source/ucp/file/bc.cxx | 6
ucb/source/ucp/file/filcmd.cxx | 4
ucb/source/ucp/file/filglob.cxx | 2
ucb/source/ucp/file/filinpstr.cxx | 12
ucb/source/ucp/file/filprp.cxx | 2
ucb/source/ucp/file/filrset.cxx | 18
ucb/source/ucp/file/filstr.cxx | 18
ucb/source/ucp/file/filtask.cxx | 4
ucb/source/ucp/file/prov.cxx | 8
ucb/source/ucp/file/shell.cxx | 16
ucb/source/ucp/tdoc/tdoc_storage.cxx | 12
unotest/source/cpp/toabsolutefileurl.cxx | 23
ure/source/uretest/cppmain.cc | 4
ure/source/uretest/cppserver.cc | 4
ure/source/uretest/cpptest.cc | 4
uui/source/iahndl-authentication.cxx | 6
uui/source/iahndl-errorhandler.cxx | 3
uui/source/iahndl-filter.cxx | 4
uui/source/iahndl-locking.cxx | 9
uui/source/iahndl-ssl.cxx | 8
uui/source/iahndl.cxx | 16
vbahelper/source/msforms/vbacontrol.cxx | 6
vbahelper/source/msforms/vbalistbox.cxx | 10
vbahelper/source/msforms/vbalistcontrolhelper.cxx | 6
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 8
vbahelper/source/vbahelper/vbacolorformat.cxx | 4
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 4
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 2
vbahelper/source/vbahelper/vbacommandbars.cxx | 4
vbahelper/source/vbahelper/vbadialogbase.cxx | 4
vbahelper/source/vbahelper/vbadocumentbase.cxx | 4
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 2
vbahelper/source/vbahelper/vbahelper.cxx | 10
vbahelper/source/vbahelper/vbalineformat.cxx | 22
vbahelper/source/vbahelper/vbapictureformat.cxx | 4
vbahelper/source/vbahelper/vbashape.cxx | 16
vbahelper/source/vbahelper/vbashapes.cxx | 2
vbahelper/source/vbahelper/vbatextframe.cxx | 2
vcl/source/window/syschild.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6
xmlhelp/source/cxxhelp/provider/inputstream.cxx | 3
xmlhelp/source/treeview/tvread.cxx | 4
xmloff/source/core/xmlimp.cxx | 3
xmlreader/source/span.cxx | 3
xmlreader/source/xmlreader.cxx | 93 --
xmlscript/source/xml_helper/xml_impctx.cxx | 2
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 4
xmlscript/test/imexp.cxx | 2
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 2
258 files changed, 1443 insertions(+), 2150 deletions(-)
New commits:
commit e7bc3cab019fbf040f9fb8b53ae2cf3f977d200b
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 23 12:03:21 2014 +0200
remove boilerplate in UNO Exception constructor calls
Now that we have default values for Exception constructor params,
remove lots of boilerplate code.
Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 16d58e2..eba8182e 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -138,7 +138,7 @@ void SAL_CALL SIDEModel::storeToURL( const OUString&,
void SIDEModel::notImplemented() throw ( io::IOException )
{
- throw io::IOException("Can't store IDE model", uno::Reference< uno::XInterface >() );
+ throw io::IOException("Can't store IDE model" );
}
} // namespace basctl
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index e66560a..d5843fe 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -164,7 +164,7 @@ void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const u
throw (uno::RuntimeException)
{
if ( !Number.hasValue() )
- throw uno::RuntimeException("Missing Required Parameter", uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException("Missing Required Parameter" );
Number >>= m_nNumber;
Description >>= m_sDescription;
Source >>= m_sSource;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 86881ee..7e5dcfd 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -212,8 +212,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void )
if( !xAccess.is() )
{
throw DeploymentException(
- OUString("/singletons/com.sun.star.reflection.theTypeDescriptionManager singleton not accessible"),
- Reference< XInterface >() );
+ "/singletons/com.sun.star.reflection.theTypeDescriptionManager singleton not accessible" );
}
}
return xAccess;
@@ -236,8 +235,7 @@ Reference< XTypeConverter > getTypeConverter_Impl( void )
if( !xTypeConverter.is() )
{
throw DeploymentException(
- OUString("com.sun.star.script.Converter service not accessible"),
- Reference< XInterface >() );
+ "com.sun.star.script.Converter service not accessible" );
}
}
return xTypeConverter;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 6bbe9885..924c488 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -242,7 +242,7 @@ void NameContainer::removeByName( const OUString& aName )
if( aIt == mHashMap.end() )
{
OUString sMessage = "\"" + aName + "\" not found";
- throw NoSuchElementException(sMessage, uno::Reference< uno::XInterface >());
+ throw NoSuchElementException(sMessage);
}
sal_Int32 iHashResult = (*aIt).second;
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index ac13fa2..c93df64 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -194,14 +194,10 @@ Bridge::Bridge(
{
assert(factory.is() && connection.is());
if (!binaryUno_.is()) {
- throw css::uno::RuntimeException(
- "URP: no binary UNO environment",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("URP: no binary UNO environment");
}
if (!(cppToBinaryMapping_.is() && binaryToCppMapping_.is())) {
- throw css::uno::RuntimeException(
- "URP: no C++ UNO mapping",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("URP: no C++ UNO mapping");
}
passive_.set();
}
@@ -464,8 +460,7 @@ OUString Bridge::registerOutgoingInterface(
assert(stub != &newStub);
if (j->second.references == SAL_MAX_UINT32) {
throw css::uno::RuntimeException(
- "URP: stub reference count overflow",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: stub reference count overflow");
}
++j->second.references;
}
@@ -505,15 +500,11 @@ void Bridge::releaseStub(
osl::MutexGuard g(mutex_);
Stubs::iterator i(stubs_.find(oid));
if (i == stubs_.end()) {
- throw css::uno::RuntimeException(
- "URP: release unknown stub",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("URP: release unknown stub");
}
Stub::iterator j(i->second.find(type));
if (j == i->second.end()) {
- throw css::uno::RuntimeException(
- "URP: release unknown stub",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("URP: release unknown stub");
}
assert(j->second.references > 0);
--j->second.references;
@@ -880,9 +871,8 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
for (sal_Int32 i = 0; i != sInstanceName.getLength(); ++i) {
if (sInstanceName[i] > 0x7F) {
throw css::uno::RuntimeException(
- ("XBridge::getInstance sInstanceName contains non-ASCII"
- " character"),
- css::uno::Reference< css::uno::XInterface >());
+ "XBridge::getInstance sInstanceName contains non-ASCII"
+ " character");
}
}
css::uno::TypeDescription ifc(
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index 143dd34..81d4667 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -40,9 +40,7 @@ css::uno::UnoInterfaceReference get() {
reinterpret_cast< void ** >(&cc.m_pUnoI),
OUString(UNO_LB_UNO).pData, 0))
{
- throw css::uno::RuntimeException(
- "uno_getCurrentContext failed",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("uno_getCurrentContext failed");
}
return cc;
}
@@ -53,9 +51,7 @@ void set(css::uno::UnoInterfaceReference const & value) {
cc.m_pUnoI,
OUString(UNO_LB_UNO).pData, 0))
{
- throw css::uno::RuntimeException(
- "uno_setCurrentContext failed",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("uno_setCurrentContext failed");
}
}
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index ff30a8e..30b876e 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -74,10 +74,9 @@ void IncomingRequest::execute() const {
isExc = !execute_throw(&ret, &outArgs);
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
- ("caught C++ exception: " +
- OStringToOUString(
- OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
- css::uno::Reference< css::uno::XInterface >());
+ "caught C++ exception: " +
+ OStringToOUString(
+ OString(e.what()), RTL_TEXTENCODING_ASCII_US));
// best-effort string conversion
}
} catch (const css::uno::RuntimeException &) {
diff --git a/binaryurp/source/marshal.cxx b/binaryurp/source/marshal.cxx
index 241c2be..ad5f2b8 100644
--- a/binaryurp/source/marshal.cxx
+++ b/binaryurp/source/marshal.cxx
@@ -81,8 +81,7 @@ void writeString(
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
throw css::uno::RuntimeException(
- "UNO string contains invalid UTF-16 sequence",
- css::uno::Reference< css::uno::XInterface >());
+ "UNO string contains invalid UTF-16 sequence");
}
writeCompressed(buffer, static_cast< sal_uInt32 >(v.getLength()));
buffer->insert(buffer->end(), v.getStr(), v.getStr() + v.getLength());
diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx
index a0fb6d2..06b2553 100644
--- a/binaryurp/source/outgoingrequests.cxx
+++ b/binaryurp/source/outgoingrequests.cxx
@@ -45,8 +45,7 @@ OutgoingRequest OutgoingRequests::top(rtl::ByteSequence const & tid) {
Map::iterator i(map_.find(tid));
if (i == map_.end()) {
throw css::uno::RuntimeException(
- "URP: reply for unknown TID",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: reply for unknown TID");
}
OSL_ASSERT(!i->second.empty());
return i->second.back();
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 355ac87..a28dbc5 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -107,10 +107,9 @@ void Proxy::do_dispatch(
do_dispatch_throw(member, returnValue, arguments, exception);
} catch (const std::exception & e) {
throw css::uno::RuntimeException(
- ("caught C++ exception: " +
+ "caught C++ exception: " +
OStringToOUString(
- OString(e.what()), RTL_TEXTENCODING_ASCII_US)),
- css::uno::Reference< css::uno::XInterface >());
+ OString(e.what()), RTL_TEXTENCODING_ASCII_US));
// best-effort string conversion
}
} catch (const css::uno::RuntimeException &) {
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 99b2744..92da485 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -63,8 +63,7 @@ css::uno::Sequence< sal_Int8 > read(
assert(connection.is());
if (size > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- "binaryurp::Reader: block size too large",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Reader: block size too large");
}
css::uno::Sequence< sal_Int8 > buf;
sal_Int32 n = connection->read(buf, static_cast< sal_Int32 >(size));
@@ -73,8 +72,7 @@ css::uno::Sequence< sal_Int8 > read(
}
if (n != static_cast< sal_Int32 >(size)) {
throw css::io::IOException(
- "binaryurp::Reader: premature end of input",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Reader: premature end of input");
}
assert(buf.getLength() == static_cast< sal_Int32 >(size));
return buf;
@@ -113,8 +111,7 @@ void Reader::execute() {
header.done();
if (count == 0) {
throw css::io::IOException(
- "binaryurp::Reader: block with zero message count received",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Reader: block with zero message count received");
}
Unmarshal block(bridge_, state_, read(con, size, false));
for (sal_uInt32 i = 0; i != count; ++i) {
@@ -152,9 +149,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
if (((flags2 & 0x40) != 0) != forceSynchronous) {
// bit 6: SYNCHRONOUS
throw css::uno::RuntimeException(
- ("URP: request message with MUSTREPLY != SYNCHRONOUS"
- " received"),
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with MUSTREPLY != SYNCHRONOUS"
+ " received");
}
} else {
forceSynchronous = false;
@@ -176,9 +172,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
} else {
if (!lastType_.is()) {
throw css::uno::RuntimeException(
- ("URP: request message with NEWTYPE received when last"
- " interface type has not yet been set"),
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with NEWTYPE received when last"
+ " interface type has not yet been set");
}
type = lastType_;
}
@@ -187,16 +182,14 @@ void Reader::readMessage(Unmarshal & unmarshal) {
oid = unmarshal.readOid();
if (oid.isEmpty()) {
throw css::io::IOException(
- "binaryurp::Unmarshal: emtpy OID",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: emtpy OID");
}
lastOid_ = oid;
} else {
if (lastOid_.isEmpty()) {
throw css::uno::RuntimeException(
- ("URP: request message with NEWOID received when last OID has"
- " not yet been set"),
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with NEWOID received when last OID has"
+ " not yet been set");
}
oid = lastOid_;
}
@@ -205,15 +198,13 @@ void Reader::readMessage(Unmarshal & unmarshal) {
type.makeComplete();
if (type.get()->eTypeClass != typelib_TypeClass_INTERFACE) {
throw css::uno::RuntimeException(
- "URP: request message with non-interface interface type received",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with non-interface interface type received");
}
typelib_InterfaceTypeDescription * itd =
reinterpret_cast< typelib_InterfaceTypeDescription * >(type.get());
if (functionId >= itd->nMapFunctionIndexToMemberIndex) {
throw css::uno::RuntimeException(
- "URP: request message with unknown function ID received",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with unknown function ID received");
}
sal_Int32 memberId = itd->pMapFunctionIndexToMemberIndex[functionId];
css::uno::TypeDescription memberTd(itd->ppAllMembers[memberId]);
@@ -289,9 +280,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
break;
default:
throw css::uno::RuntimeException(
- ("URP: request message with UrpProtocolProperties OID and"
- " unknown function ID received"),
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with UrpProtocolProperties OID and"
+ " unknown function ID received");
}
} else {
css::uno::UnoInterfaceReference obj;
@@ -320,24 +310,21 @@ void Reader::readMessage(Unmarshal & unmarshal) {
css::uno::XInterface > >::get())))))
{
throw css::uno::RuntimeException(
- ("URP: queryInterface request message with unknown OID"
- " received"),
- css::uno::Reference< css::uno::XInterface >());
+ "URP: queryInterface request message with unknown OID"
+ " received");
}
}
break;
case SPECIAL_FUNCTION_ID_RESERVED:
throw css::uno::RuntimeException(
- "URP: request message with unknown function ID 1 received",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with unknown function ID 1 received");
case SPECIAL_FUNCTION_ID_RELEASE:
break;
default:
obj = bridge_->findStub(oid, type);
if (!obj.is()) {
throw css::uno::RuntimeException(
- "URP: request message with unknown OID received",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: request message with unknown OID received");
}
break;
}
@@ -413,8 +400,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
}
if (!ok) {
throw css::uno::RuntimeException(
- "URP: reply message with bad exception type received",
- css::uno::Reference< css::uno::XInterface >());
+ "URP: reply message with bad exception type received");
}
}
} else {
@@ -483,9 +469,8 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
}
if (lastTid_.getLength() == 0) {
throw css::uno::RuntimeException(
- ("URP: message with NEWTID received when last TID has not yet been"
- " set"),
- css::uno::Reference< css::uno::XInterface >());
+ "URP: message with NEWTID received when last TID has not yet been"
+ " set");
}
return lastTid_;
}
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index d413e5f..d04c889 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -144,8 +144,7 @@ css::uno::TypeDescription Unmarshal::readType() {
case typelib_TypeClass_ANY:
if ((flags & 0x80) != 0) {
throw css::io::IOException(
- "binaryurp::Unmarshal: cache flag of simple type is set",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: cache flag of simple type is set");
}
return css::uno::TypeDescription(
*typelib_static_type_getByTypeClass(
@@ -160,8 +159,7 @@ css::uno::TypeDescription Unmarshal::readType() {
if ((flags & 0x80) == 0) {
if (idx == cache::ignore || !state_.typeCache[idx].is()) {
throw css::io::IOException(
- "binaryurp::Unmarshal: unknown type cache index",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: unknown type cache index");
}
return state_.typeCache[idx];
} else {
@@ -172,8 +170,7 @@ css::uno::TypeDescription Unmarshal::readType() {
{
throw css::io::IOException(
- "binaryurp::Unmarshal: type with unknown name: " + str,
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: type with unknown name: " + str);
}
for (css::uno::TypeDescription t2(t);
t2.get()->eTypeClass == typelib_TypeClass_SEQUENCE;)
@@ -184,17 +181,15 @@ css::uno::TypeDescription Unmarshal::readType() {
t2.get())->pType);
if (!t2.is()) {
throw css::io::IOException(
- ("binaryurp::Unmarshal: sequence type with unknown"
- " component type"),
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: sequence type with unknown"
+ " component type");
}
switch (t2.get()->eTypeClass) {
case typelib_TypeClass_VOID:
case typelib_TypeClass_EXCEPTION:
throw css::io::IOException(
- ("binaryurp::Unmarshal: sequence type with bad"
- " component type"),
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: sequence type with bad"
+ " component type");
default:
break;
}
@@ -207,8 +202,7 @@ css::uno::TypeDescription Unmarshal::readType() {
}
default:
throw css::io::IOException(
- "binaryurp::Unmarshal: type of unknown type class",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: type of unknown type class");
}
}
@@ -217,16 +211,14 @@ OUString Unmarshal::readOid() {
for (sal_Int32 i = 0; i != oid.getLength(); ++i) {
if (oid[i] > 0x7F) {
throw css::io::IOException(
- "binaryurp::Unmarshal: OID contains non-ASCII character",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: OID contains non-ASCII character");
}
}
sal_uInt16 idx = readCacheIndex();
if (oid.isEmpty() && idx != cache::ignore) {
if (state_.oidCache[idx].isEmpty()) {
throw css::io::IOException(
- "binaryurp::Unmarshal: unknown OID cache index",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: unknown OID cache index");
}
return state_.oidCache[idx];
}
@@ -249,8 +241,7 @@ rtl::ByteSequence Unmarshal::readTid() {
if (tid.getLength() == 0) {
if (idx == cache::ignore || state_.tidCache[idx].getLength() == 0) {
throw css::io::IOException(
- "binaryurp::Unmarshal: unknown TID cache index",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: unknown TID cache index");
}
return state_.tidCache[idx];
}
@@ -273,8 +264,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
sal_uInt8 v = read8();
if (v > 1) {
throw css::io::IOException(
- "binaryurp::Unmarshal: boolean of unknown value",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: boolean of unknown value");
}
return BinaryAny(type, &v);
}
@@ -320,8 +310,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
css::uno::TypeDescription t(readType());
if (t.get()->eTypeClass == typelib_TypeClass_ANY) {
throw css::io::IOException(
- "binaryurp::Unmarshal: any of type ANY",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: any of type ANY");
}
return readValue(t);
}
@@ -343,8 +332,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
}
if (!found) {
throw css::io::IOException(
- "binaryurp::Unmarshal: unknown enum value",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: unknown enum value");
}
return BinaryAny(type, &v);
}
@@ -374,16 +362,14 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) {
void Unmarshal::done() const {
if (data_ != end_) {
throw css::io::IOException(
- "binaryurp::Unmarshal: block contains excess data",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: block contains excess data");
}
}
void Unmarshal::check(sal_Int32 size) const {
if (end_ - data_ < size) {
throw css::io::IOException(
- "binaryurp::Unmarshal: trying to read past end of block",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: trying to read past end of block");
}
}
@@ -396,8 +382,7 @@ sal_uInt16 Unmarshal::readCacheIndex() {
sal_uInt16 idx = read16();
if (idx >= cache::size && idx != cache::ignore) {
throw css::io::IOException(
- "binaryurp::Unmarshal: cache index out of range",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: cache index out of range");
}
return idx;
}
@@ -418,8 +403,7 @@ OUString Unmarshal::readString() {
sal_uInt32 n = readCompressed();
if (n > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- "binaryurp::Unmarshal: string size too large",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: string size too large");
}
check(static_cast< sal_Int32 >(n));
OUString s;
@@ -431,8 +415,7 @@ OUString Unmarshal::readString() {
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
{
throw css::io::IOException(
- "binaryurp::Unmarshal: string does not contain UTF-8",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: string does not contain UTF-8");
}
data_ += n;
return s;
@@ -443,8 +426,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) {
sal_uInt32 n = readCompressed();
if (n > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
- "binaryurp::Unmarshal: sequence size too large",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: sequence size too large");
}
if (n == 0) {
return BinaryAny(type, 0);
@@ -471,8 +453,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) {
// sal_uInt32 * sal_Int32 -> sal_uInt64 cannot overflow
if (size > SAL_MAX_SIZE - SAL_SEQUENCE_HEADER_SIZE) {
throw css::uno::RuntimeException(
- "binaryurp::Unmarshal: sequence size too large",
- css::uno::Reference< css::uno::XInterface >());
+ "binaryurp::Unmarshal: sequence size too large");
}
void * buf = allocate(
SAL_SEQUENCE_HEADER_SIZE + static_cast< sal_Size >(size));
diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx
index 6b666b0..a47abf8 100644
--- a/binaryurp/source/writer.cxx
+++ b/binaryurp/source/writer.cxx
@@ -238,9 +238,7 @@ void Writer::sendRequest(
}
OSL_ASSERT(functionId >= 0);
if (functionId > SAL_MAX_UINT16) {
- throw css::uno::RuntimeException(
- "function ID too large for URP",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("function ID too large for URP");
}
std::vector< unsigned char > buf;
bool newType = !(lastType_.is() && t.equals(lastType_));
@@ -406,8 +404,7 @@ void Writer::sendMessage(std::vector< unsigned char > const & buffer) {
std::vector< unsigned char > header;
if (buffer.size() > SAL_MAX_UINT32) {
throw css::uno::RuntimeException(
- "message too large for URP",
- css::uno::Reference< css::uno::XInterface >());
+ "message too large for URP");
}
Marshal::write32(&header, static_cast< sal_uInt32 >(buffer.size()));
Marshal::write32(&header, 1);
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 1ab4742..875baa3 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -310,8 +310,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -341,8 +340,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -353,9 +351,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -373,9 +369,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index c79d8d4..a7234c2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -254,40 +254,38 @@ namespace CPPU_CURRENT_NAMESPACE
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
- // destruct uno exception
- ::uno_any_destruct( pUnoExc, 0 );
- // avoiding locked counts
- static RTTI * s_rtti = 0;
- if (! s_rtti)
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if (! s_rtti)
- {
+ // destruct uno exception
+ ::uno_any_destruct( pUnoExc, 0 );
+ // avoiding locked counts
+ static RTTI * s_rtti = 0;
+ if (! s_rtti)
+ {
+ MutexGuard guard( Mutex::getGlobalMutex() );
+ if (! s_rtti)
+ {
#ifdef LEAK_STATIC_DATA
- s_rtti = new RTTI();
+ s_rtti = new RTTI();
#else
- static RTTI rtti_data;
- s_rtti = &rtti_data;
+ static RTTI rtti_data;
+ s_rtti = &rtti_data;
#endif
- }
- }
- rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
- TYPELIB_DANGER_RELEASE( pTypeDescr );
- OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
- if (! rtti)
- {
- throw RuntimeException(
- OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
- }
+ }
+ }
+ rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
+ TYPELIB_DANGER_RELEASE( pTypeDescr );
+ OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
+ if (! rtti)
+ {
+ throw RuntimeException(
+ OUString("no rtti for type ") +
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
+ }
}
__cxa_throw( pCppExc, rtti, deleteException );
@@ -309,9 +307,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -330,9 +326,7 @@ namespace CPPU_CURRENT_NAMESPACE
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 754117d..73d0b71 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -230,8 +230,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -279,9 +277,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -301,8 +297,7 @@ namespace CPPU_CURRENT_NAMESPACE
if (0 == pExcTypeDescr)
{
RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 8dadc79..165704d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -236,8 +236,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
@@ -267,8 +266,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -279,9 +277,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -300,9 +296,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 754117d..289a020 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -230,8 +230,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -279,9 +277,7 @@ namespace CPPU_CURRENT_NAMESPACE
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -300,9 +296,7 @@ namespace CPPU_CURRENT_NAMESPACE
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 84b12a3..0a6a211 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -227,8 +227,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -258,8 +257,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -270,9 +268,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if defined _DEBUG
@@ -291,9 +287,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if defined _DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index d238c94..78ff54f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -228,8 +228,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -260,7 +259,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
throw RuntimeException(
OUString("no rtti for type ") +
*reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ );
}
}
@@ -271,9 +270,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if defined _DEBUG
@@ -292,9 +289,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if defined _DEBUG
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 08063a6..c2f1a14 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -243,8 +243,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -273,9 +271,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -294,9 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index d460180e..b520054 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -242,13 +242,9 @@ static void cpp_call(
appendCString(buf, typeid(e).name());
buf.append(": ");
appendCString(buf, e.what());
- throw RuntimeException(
- buf.makeStringAndClear(), Reference< XInterface >());
+ throw RuntimeException(buf.makeStringAndClear());
} catch (...) {
- throw RuntimeException(
- OUString(
- "C++ code threw unknown exception"),
- Reference< XInterface >());
+ throw RuntimeException("C++ code threw unknown exception");
}
*ppUnoExc = 0;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 6988dcb..2368541 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -305,8 +305,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -336,8 +335,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -348,9 +346,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -369,9 +365,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 664a5c0..8ba8688 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -315,8 +315,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -346,8 +345,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -358,9 +356,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -379,9 +375,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index e35493e..11a8cd4 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -243,12 +243,9 @@ static void cpp_call(
buf.append(": ");
appendCString(buf, e.what());
throw RuntimeException(
- buf.makeStringAndClear(), Reference< XInterface >());
+ buf.makeStringAndClear());
} catch (...) {
- throw RuntimeException(
- OUString(
- "C++ code threw unknown exception"),
- Reference< XInterface >());
+ throw RuntimeException("C++ code threw unknown exception");
}
*ppUnoExc = 0;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 25d4c2b..71502db 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -230,8 +230,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -261,8 +260,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -273,9 +271,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -294,9 +290,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index f0447a1..16e13c9 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -227,8 +227,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -258,8 +257,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -270,9 +268,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if defined _DEBUG
@@ -291,9 +287,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if defined _DEBUG
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index 3091dc5..ea75423 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -221,8 +221,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -252,8 +251,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -264,9 +262,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -285,9 +281,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
index 3091dc5..ea75423 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx
@@ -221,8 +221,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("cannot get typedescription for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
@@ -252,8 +251,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
{
throw RuntimeException(
OUString("no rtti for type ") +
- *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
- Reference< XInterface >() );
+ *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ) );
}
}
@@ -264,9 +262,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
{
if (! header)
{
- RuntimeException aRE(
- OUString("no exception header!"),
- Reference< XInterface >() );
+ RuntimeException aRE( "no exception header!" );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
@@ -285,9 +281,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping
typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
if (0 == pExcTypeDescr)
{
- RuntimeException aRE(
- OUString("exception type not found: ") + unoName,
- Reference< XInterface >() );
+ RuntimeException aRE( OUString("exception type not found: ") + unoName );
Type const & rType = ::getCppuType( &aRE );
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
#if OSL_DEBUG_LEVEL > 0
diff --git a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
index 0ff2880..6684de9 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx
@@ -238,13 +238,9 @@ static void cpp_call(
appendCString(buf, typeid(e).name());
buf.append(": ");
appendCString(buf, e.what());
- throw RuntimeException(
- buf.makeStringAndClear(), Reference< XInterface >());
+ throw RuntimeException(buf.makeStringAndClear());
} catch (...) {
- throw RuntimeException(
- OUString(
- "C++ code threw unknown exception"),
- Reference< XInterface >());
+ throw RuntimeException("C++ code threw unknown exception");
}
*ppUnoExc = 0;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 04f6d0b..d5637e7 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -539,8 +539,7 @@ int msci_filterCppException(
buf.append( "\", RTTI-name=\"" );
buf.append( aRTTIname );
buf.append( "\"!" );
- RuntimeException exc(
- buf.makeStringAndClear(), Reference< XInterface >() );
+ RuntimeException exc( buf.makeStringAndClear() );
uno_type_any_constructAndConvert(
pUnoExc, &exc,
::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
@@ -565,10 +564,8 @@ int msci_filterCppException(
}
// though this unknown exception leaks now, no user-defined exception
// is ever thrown thru the binary C-UNO dispatcher call stack.
- RuntimeException exc(
- OUString( "[msci_uno bridge error] unexpected "
- "C++ exception occurred!" ),
- Reference< XInterface >() );
+ RuntimeException exc( "[msci_uno bridge error] unexpected "
+ "C++ exception occurred!" );
uno_type_any_constructAndConvert(
pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
return EXCEPTION_EXECUTE_HANDLER;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 26688aa..b449a28 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -783,8 +783,7 @@ int mscx_filterCppException(
buf.append( "\", RTTI-name=\"" );
buf.append( aRTTIname );
buf.append( "\"!" );
- RuntimeException exc(
- buf.makeStringAndClear(), Reference< XInterface >() );
+ RuntimeException exc( buf.makeStringAndClear() );
uno_type_any_constructAndConvert(
pUnoExc, &exc,
::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
@@ -804,10 +803,8 @@ int mscx_filterCppException(
}
// though this unknown exception leaks now, no user-defined exception
// is ever thrown thru the binary C-UNO dispatcher call stack.
- RuntimeException exc(
- OUString( "[mscx_uno bridge error] unexpected "
- "C++ exception occurred!" ),
- Reference< XInterface >() );
+ RuntimeException exc( "[mscx_uno bridge error] unexpected "
+ "C++ exception occurred!" );
uno_type_any_constructAndConvert(
pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
return EXCEPTION_EXECUTE_HANDLER;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 67f2a0d..7acf450 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -411,9 +411,7 @@ void unoInterfaceProxyDispatch(
((typelib_InterfaceMethodTypeDescription *)pMemberTD)->pParams,
pReturn, pArgs, ppException ) )
{
- RuntimeException aExc(
- OUString("Too many parameters!"),
- Reference< XInterface >() );
+ RuntimeException aExc( "Too many parameters!" );
Type const & rExcType = ::getCppuType( &aExc );
::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
@@ -423,9 +421,7 @@ void unoInterfaceProxyDispatch(
}
default:
{
- RuntimeException aExc(
- OUString("Illegal member type description!"),
- Reference< XInterface >() );
+ RuntimeException aExc( "Illegal member type description!" );
Type const & rExcType = ::getCppuType( &aExc );
// Binary identical null reference (whatever that comment means...)
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 2cdee08..46ebc35 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -30,8 +30,7 @@ namespace canvas
{
throw beans::UnknownPropertyException(
"PropertySetHelper: property " +
- aPropertyName + " not found.",
- uno::Reference< uno::XInterface >()
+ aPropertyName + " not found."
);
}
@@ -39,8 +38,7 @@ namespace canvas
{
throw beans::PropertyVetoException(
"PropertySetHelper: property " +
- aPropertyName + " access was vetoed.",
- uno::Reference< uno::XInterface >() );
+ aPropertyName + " access was vetoed." );
}
struct EntryComparator
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index b47be93..0f14a17 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -240,15 +240,13 @@ static OUString path_make_absolute_file_url( OUString const & path )
else
{
throw RuntimeException(
- "cannot make absolute: " + file_url,
- css::uno::Reference< XInterface >() );
+ "cannot make absolute: " + file_url );
}
}
else
{
throw RuntimeException(
- "cannot get file url from system path: " + path,
- css::uno::Reference< XInterface >() );
+ "cannot get file url from system path: " + path );
}
}
@@ -381,8 +379,7 @@ SAL_IMPLEMENT_MAIN()
buf.append( cmd_arg );
buf.append( "! Use climaker --help to print all options." );
throw RuntimeException(
- buf.makeStringAndClear(),
- css::uno::Reference< XInterface >() );
+ buf.makeStringAndClear() );
}
else
{
@@ -457,8 +454,7 @@ SAL_IMPLEMENT_MAIN()
{
throw RuntimeException(
"cannot get system path from file url " +
- output.copy( 0, slash ),
- css::uno::Reference< XInterface >() );
+ output.copy( 0, slash ) );
}
OUString filename( output.copy( slash +1 ) );
sal_Int32 dot = filename.lastIndexOf( '.' );
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 58f3c11..b3139d7 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -90,8 +90,7 @@ static inline ::System::Object ^ to_cli_constant( Any const & value )
default:
throw RuntimeException(
"unexpected constant type " +
- value.getValueType().getTypeName(),
- Reference< XInterface >() );
+ value.getValueType().getTypeName() );
}
}
@@ -1265,8 +1264,7 @@ Assembly ^ TypeEmitter::type_resolve(
else
{
throw RuntimeException(
- "unexpected member type in " + entry->m_xType->getName(),
- Reference< XInterface >() );
+ "unexpected member type in " + entry->m_xType->getName() );
}
}
else
@@ -2153,8 +2151,7 @@ Emit::CustomAttributeBuilder^ TypeEmitter::get_exception_attribute(
return nullptr;
default:
throw RuntimeException(
- "unexpected type " + xType->getName(),
- Reference< XInterface >() );
+ "unexpected type " + xType->getName() );
}
}
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 837fd5d..b388162 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -91,8 +91,7 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs
sMsg.appendAscii("\" does not exists." );
throw css::container::NoSuchElementException(
- sMsg.makeStringAndClear(),
- css::uno::Reference< css::uno::XInterface >());
+ sMsg.makeStringAndClear());
}
return xProps->getPropertyValue(sKey);
}
@@ -115,8 +114,7 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::
sMsg.appendAscii("\" does not exists." );
throw css::container::NoSuchElementException(
- sMsg.makeStringAndClear(),
- css::uno::Reference< css::uno::XInterface >());
+ sMsg.makeStringAndClear());
}
xProps->setPropertyValue(sKey, aValue);
}
@@ -137,8 +135,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode
sMsg.appendAscii("\" does not exists." );
throw css::container::NoSuchElementException(
- sMsg.makeStringAndClear(),
- css::uno::Reference< css::uno::XInterface >());
+ sMsg.makeStringAndClear());
}
css::uno::Reference< css::uno::XInterface > xNode;
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index 1023dbe..35f2d6b 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -76,8 +76,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Any& aSource)
}
throw css::beans::IllegalTypeException(
- OUString( "Any contains wrong type." ),
- css::uno::Reference< css::uno::XInterface >());
+ "Any contains wrong type." );
}
@@ -96,8 +95,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
(!lP.Value.hasValue())
)
throw css::beans::IllegalTypeException(
- OUString( "PropertyValue struct contains no useful information." ),
- css::uno::Reference< css::uno::XInterface >());
+ "PropertyValue struct contains no useful information." );
(*this)[lP.Name] = lP.Value;
continue;
}
@@ -110,8 +108,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
(!lN.Value.hasValue())
)
throw css::beans::IllegalTypeException(
- OUString( "NamedValue struct contains no useful information." ),
- css::uno::Reference< css::uno::XInterface >());
+ "NamedValue struct contains no useful information." );
(*this)[lN.Name] = lN.Value;
continue;
}
@@ -119,8 +116,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
// ignore VOID Any ... but reject wrong filled ones!
if (lSource[i].hasValue())
throw css::beans::IllegalTypeException(
- OUString( "Any contains wrong type." ),
- css::uno::Reference< css::uno::XInterface >());
+ "Any contains wrong type." );
}
}
diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx
index 65c08eb..04c81cb 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -61,8 +61,7 @@ Reference< XMultiServiceFactory > getProcessServiceFactory()
xReturn = localProcessFactory( xReturn, false );
if ( !xReturn.is() )
{
- throw DeploymentException(
- "null process service factory", Reference< XInterface >() );
+ throw DeploymentException( "null process service factory" );
}
return xReturn;
}
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 4e7259b..9c39f3d 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -314,8 +314,7 @@ void Components::insertExtensionXcsFile(
parseXcsFile(fileUri, layer, data_, 0, 0, 0);
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
- "insertExtensionXcsFile does not exist: " + e.Message,
- css::uno::Reference< css::uno::XInterface >());
+ "insertExtensionXcsFile does not exist: " + e.Message);
}
}
@@ -330,8 +329,7 @@ void Components::insertExtensionXcuFile(
} catch (css::container::NoSuchElementException & e) {
data_.removeExtensionXcuAdditions(fileUri);
throw css::uno::RuntimeException(
- "insertExtensionXcuFile does not exist: " + e.Message,
- css::uno::Reference< css::uno::XInterface >());
+ "insertExtensionXcuFile does not exist: " + e.Message);
}
}
@@ -413,8 +411,7 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue(
sal_Int32 i = descriptor.indexOf(' ');
if (i <= 0) {
throw css::uno::RuntimeException(
- "bad external value descriptor " + descriptor,
- css::uno::Reference< css::uno::XInterface >());
+ "bad external value descriptor " + descriptor);
}
//TODO: Do not make calls with mutex locked:
OUString name(descriptor.copy(0, i));
@@ -450,17 +447,14 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue(
value))
{
throw css::uno::RuntimeException(
- "cannot obtain external value through " + descriptor,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot obtain external value through " + descriptor);
}
} catch (css::beans::UnknownPropertyException & e) {
throw css::uno::RuntimeException(
- "unknown external value descriptor ID: " + e.Message,
- css::uno::Reference< css::uno::XInterface >());
+ "unknown external value descriptor ID: " + e.Message);
} catch (css::lang::WrappedTargetException & e) {
throw css::uno::RuntimeException(
- "cannot obtain external value: " + e.Message,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot obtain external value: " + e.Message);
}
}
return value;
@@ -483,15 +477,13 @@ Components::Components(
}
if (!modificationFileUrl_.isEmpty()) {
throw css::uno::RuntimeException(
- "CONFIGURATION_LAYERS: \"user\" followed by further layers",
- css::uno::Reference< css::uno::XInterface >());
+ "CONFIGURATION_LAYERS: \"user\" followed by further layers");
}
sal_Int32 c = i;
for (;; ++c) {
if (c == conf.getLength() || conf[c] == ' ') {
throw css::uno::RuntimeException(
- "CONFIGURATION_LAYERS: missing \":\"",
- css::uno::Reference< css::uno::XInterface >());
+ "CONFIGURATION_LAYERS: missing \":\"");
}
if (conf[c] == ':') {
break;
@@ -513,8 +505,7 @@ Components::Components(
} else if ( type == "sharedext" ) {
if (sharedExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
- "CONFIGURATION_LAYERS: multiple \"sharedext\" layers",
- css::uno::Reference< css::uno::XInterface >());
+ "CONFIGURATION_LAYERS: multiple \"sharedext\" layers");
}
sharedExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
@@ -522,8 +513,7 @@ Components::Components(
} else if ( type == "userext" ) {
if (userExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
- "CONFIGURATION_LAYERS: multiple \"userext\" layers",
- css::uno::Reference< css::uno::XInterface >());
+ "CONFIGURATION_LAYERS: multiple \"userext\" layers");
}
userExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
@@ -537,8 +527,7 @@ Components::Components(
} else if ( type == "user" ) {
if (url.isEmpty()) {
throw css::uno::RuntimeException(
- "CONFIGURATION_LAYERS: empty \"user\" URL",
- css::uno::Reference< css::uno::XInterface >());
+ "CONFIGURATION_LAYERS: empty \"user\" URL");
}
modificationFileUrl_ = url;
parseModificationLayer(url);
@@ -562,8 +551,7 @@ Components::Components(
#endif
else {
throw css::uno::RuntimeException(
- "CONFIGURATION_LAYERS: unknown layer type \"" + type + "\"",
- css::uno::Reference< css::uno::XInterface >());
+ "CONFIGURATION_LAYERS: unknown layer type \"" + type + "\"");
}
i = n;
}
@@ -611,8 +599,7 @@ void Components::parseFiles(
// fall through
default:
throw css::uno::RuntimeException(
- "cannot open directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot open directory " + url);
}
for (;;) {
osl::DirectoryItem i;
@@ -622,16 +609,14 @@ void Components::parseFiles(
}
if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- "cannot iterate directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot iterate directory " + url);
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
if (i.getFileStatus(stat) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- "cannot stat in directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot stat in directory " + url);
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
parseFiles(layer, extension, parseFile, stat.getFileURL(), true);
@@ -643,8 +628,7 @@ void Components::parseFiles(
parseFile, stat.getFileURL(), layer, data_, 0, 0, 0);
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
- "stat'ed file does not exist: " + e.Message,
- css::uno::Reference< css::uno::XInterface >());
+ "stat'ed file does not exist: " + e.Message);
}
}
}
@@ -687,8 +671,7 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
return;
default:
throw css::uno::RuntimeException(
- "cannot open directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot open directory " + url);
}
UnresolvedList unres;
std::set< OUString > existingDeps;
@@ -701,16 +684,14 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
}
if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- "cannot iterate directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot iterate directory " + url);
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
if (i.getFileStatus(stat) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- "cannot stat in directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot stat in directory " + url);
}
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
OUString file(stat.getFileName());
@@ -724,8 +705,7 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
new XcdParser(layer, processedDeps, data_));
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
- "stat'ed file does not exist: " + e.Message,
- css::uno::Reference< css::uno::XInterface >());
+ "stat'ed file does not exist: " + e.Message);
}
if (manager->parse(0)) {
processedDeps.insert(name);
@@ -748,8 +728,7 @@ void Components::parseXcdFiles(int layer, OUString const & url) {
}
if (!resolved) {
throw css::uno::RuntimeException(
- "xcd: unresolved dependencies in " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "xcd: unresolved dependencies in " + url);
}
}
}
@@ -826,8 +805,7 @@ int Components::getExtensionLayer(bool shared) {
int layer = shared ? sharedExtensionLayer_ : userExtensionLayer_;
if (layer == -1) {
throw css::uno::RuntimeException(
- "insert extension xcs/xcu file into undefined layer",
- css::uno::Reference< css::uno::XInterface >());
+ "insert extension xcs/xcu file into undefined layer");
}
return layer;
}
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index f6535df..1cd40d1 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -154,9 +154,8 @@ OUString Data::fullTemplateName(
{
if (component.indexOf(':') != -1 || name.indexOf(':') != -1) {
throw css::uno::RuntimeException(
- ("bad component/name pair containing colon " + component + "/" +
- name),
- css::uno::Reference< css::uno::XInterface >());
+ "bad component/name pair containing colon " + component + "/" +
+ name);
}
OUStringBuffer buf(component);
buf.append(':');
@@ -197,8 +196,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
{
if (pathRepresentation.isEmpty() || pathRepresentation[0] != '/') {
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
if (path != 0) {
path->clear();
@@ -219,8 +217,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
if (n == -1 || setElement)
{
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
NodeMap const & components = getComponents();
NodeMap::const_iterator i(components.find(seg));
@@ -243,8 +240,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
pathRepresentation[n++] != '/')
{
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
// for backwards compatibility, ignore a final slash
if (n == pathRepresentation.getLength()) {
@@ -262,8 +258,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
pathRepresentation, n, &seg, &setElement, &templateName);
if (n == -1) {
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
// For backwards compatibility, allow set members to be accessed with
// simple path segments, like group members:
@@ -273,8 +268,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
case Node::KIND_LOCALIZED_PROPERTY:
if (!templateName.isEmpty()) {
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
break;
case Node::KIND_SET:
@@ -283,21 +277,18 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
templateName))
{
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
break;
default:
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
if (!templateName.isEmpty() && p != 0) {
assert(!p->getTemplateName().isEmpty());
if (!equalTemplateNames(templateName, p->getTemplateName())) {
throw css::uno::RuntimeException(
- "bad path " + pathRepresentation,
- css::uno::Reference< css::uno::XInterface >());
+ "bad path " + pathRepresentation);
}
}
}
@@ -324,8 +315,7 @@ Additions * Data::addExtensionXcuAdditions(
url, rtl::Reference< ExtensionXcu >())).first);
if (i->second.is()) {
throw css::uno::RuntimeException(
- "already added extension xcu " + url,
- css::uno::Reference< css::uno::XInterface >());
+ "already added extension xcu " + url);
}
i->second = item;
item->layer = layer;
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index 661f1aa..dafea1e 100644
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -36,8 +36,7 @@ namespace configmgr {
NodeMap & Node::getMembers() {
assert(false);
- throw css::uno::RuntimeException(
- "this cannot happen", css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("this cannot happen");
}
OUString Node::getTemplateName() const {
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index 2856046..5133d1f 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -54,8 +54,7 @@ bool parseSegment(
return *index == path.getLength();
}
}
- throw css::uno::RuntimeException(
- "bad path " + path, css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("bad path " + path);
}
}
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index b257607..93e5a85 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -60,9 +60,7 @@ Type elementType(Type type) {
return TYPE_HEXBINARY;
default:
assert(false);
- throw css::uno::RuntimeException(
- "this cannot happen",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("this cannot happen");
}
}
@@ -101,9 +99,7 @@ css::uno::Type mapType(Type type) {
css::uno::Sequence< css::uno::Sequence< sal_Int8 > > >::get();
default:
assert(false);
- throw css::uno::RuntimeException(
- "this cannot happen",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("this cannot happen");
}
}
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 1ed0214..9c682e4 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -170,8 +170,7 @@ template< typename T > css::uno::Any parseSingleValue(
{
T val;
if (!parseValue(text, &val)) {
- throw css::uno::RuntimeException(
- "invalid value", css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("invalid value");
}
return css::uno::makeAny(val);
}
@@ -194,9 +193,7 @@ template< typename T > css::uno::Any parseListValue(
if (!parseValue(
xmlreader::Span(t.begin, i == -1 ? t.length : i), &val))
{
- throw css::uno::RuntimeException(
- "invalid value",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("invalid value");
}
seq.push_back(val);
if (i < 0) {
@@ -214,9 +211,7 @@ css::uno::Any parseValue(
{
switch (type) {
case TYPE_ANY:
- throw css::uno::RuntimeException(
- "invalid value of type any",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("invalid value of type any");
case TYPE_BOOLEAN:
return parseSingleValue< sal_Bool >(text);
case TYPE_SHORT:
@@ -248,9 +243,7 @@ css::uno::Any parseValue(
separator, text);
default:
assert(false);
- throw css::uno::RuntimeException(
- "this cannot happen",
- css::uno::Reference< css::uno::XInterface >());
+ throw css::uno::RuntimeException("this cannot happen");
}
}
@@ -332,8 +325,7 @@ bool ValueParser::startElement(
pad_.add(RTL_CONSTASCII_STRINGPARAM("\xEF\xBF\xBF"));
} else {
throw css::uno::RuntimeException(
- "bad unicode scalar attribute in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "bad unicode scalar attribute in " + reader.getUrl());
}
state_ = State(state_ + 1);
return true;
@@ -343,8 +335,7 @@ bool ValueParser::startElement(
break;
}
throw css::uno::RuntimeException(
- "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl());
}
bool ValueParser::endElement() {
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index a47fe25..235dda0 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -212,8 +212,7 @@ bool dumpWindowsRegistry(OUString* pFileURL)
return false;
default:
throw css::uno::RuntimeException(
- "cannot create temporary file",
- css::uno::Reference< css::uno::XInterface >());
+ "cannot create temporary file");
}
writeData(
aFileHandle,
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index b3d7b87..9bcdd21 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -69,8 +69,7 @@ OString convertToUtf8(
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
throw css::uno::RuntimeException(
- "cannot convert to UTF-8",
- css::uno::Reference< css::uno::XInterface >());
+ "cannot convert to UTF-8");
}
return s;
}
@@ -110,7 +109,7 @@ void writeData_(oslFileHandle handle, char const * begin, sal_Int32 length) {
n != static_cast< sal_uInt32 >(length))
{
throw css::uno::RuntimeException(
- "write failure", css::uno::Reference< css::uno::XInterface >());
+ "write failure");
}
}
@@ -537,8 +536,7 @@ void writeModFile(
return;
default:
throw css::uno::RuntimeException(
- "cannot create directory " + dir,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot create directory " + dir);
}
TempFile tmp;
switch (osl::FileBase::createTempFile(&dir, &tmp.handle, &tmp.url)) {
@@ -552,8 +550,7 @@ void writeModFile(
return;
default:
throw css::uno::RuntimeException(
- "cannot create temporary file in " + dir,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot create temporary file in " + dir);
}
writeData_(
tmp.handle,
@@ -579,13 +576,11 @@ void writeModFile(
tmp.closed = true;
if (e != osl_File_E_None) {
throw css::uno::RuntimeException(
- "cannot close " + tmp.url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot close " + tmp.url);
}
if (osl::File::move(tmp.url, url) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- "cannot move " + tmp.url,
- css::uno::Reference< css::uno::XInterface >());
+ "cannot move " + tmp.url);
}
tmp.handle = 0;
}
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 27a813f..6b9382d 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -96,14 +96,12 @@ bool XcdParser::startElement(
}
if (!attrFile.is()) {
throw css::uno::RuntimeException(
- "no dependency file attribute in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "no dependency file attribute in " + reader.getUrl());
}
dependencyFile_ = attrFile.convertFromUtf8();
if (dependencyFile_.isEmpty()) {
throw css::uno::RuntimeException(
- "bad dependency file attribute in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "bad dependency file attribute in " + reader.getUrl());
}
}
if ((processedDependencies_.find(dependencyFile_) ==
@@ -143,8 +141,7 @@ bool XcdParser::startElement(
break;
}
throw css::uno::RuntimeException(
- "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl());
}
void XcdParser::endElement(xmlreader::XmlReader const & reader) {
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index a550240..dd51807 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -252,8 +252,7 @@ bool XcsParser::startElement(
}
}
throw css::uno::RuntimeException(
- "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "bad member <" + name.convertFromUtf8() + "> in " + reader.getUrl());
}
void XcsParser::endElement(xmlreader::XmlReader const & reader) {
@@ -295,16 +294,14 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
default:
assert(false);
throw css::uno::RuntimeException(
- "this cannot happen",
- css::uno::Reference< css::uno::XInterface >());
+ "this cannot happen");
}
} else {
if (!elements_.top().node->getMembers().insert(
NodeMap::value_type(top.name, top.node)).second)
{
throw css::uno::RuntimeException(
- "duplicate " + top.name + " in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "duplicate " + top.name + " in " + reader.getUrl());
}
}
}
@@ -320,8 +317,7 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
break;
case STATE_TEMPLATES_DONE:
throw css::uno::RuntimeException(
- "no component element in " + reader.getUrl(),
- css::uno::Reference< css::uno::XInterface >());
+ "no component element in " + reader.getUrl());
case STATE_COMPONENT_DONE:
break;
default:
@@ -350,9 +346,8 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
{
if (hasPackage) {
throw css::uno::RuntimeException(
- ("multiple component-schema package attributes in " +
- reader.getUrl()),
- css::uno::Reference< css::uno::XInterface >());
+ "multiple component-schema package attributes in " +
+ reader.getUrl());
}
hasPackage = true;
xmlreader::Span s(reader.getAttributeValue(false));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list