summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/package/pkgcontent.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/package/pkgcontent.cxx')
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx73
1 files changed, 35 insertions, 38 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 2fe01f03aff3..6f179a8d17ee 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -437,10 +437,10 @@ uno::Any SAL_CALL Content::execute(
if ( !( aCommand.Argument >>= Properties ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"Wrong argument type!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -457,10 +457,10 @@ uno::Any SAL_CALL Content::execute(
if ( !( aCommand.Argument >>= aProperties ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"Wrong argument type!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -468,10 +468,10 @@ uno::Any SAL_CALL Content::execute(
if ( !aProperties.getLength() )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"No properties!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -506,10 +506,10 @@ uno::Any SAL_CALL Content::execute(
if ( !( aCommand.Argument >>= aOpenCommand ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"Wrong argument type!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -526,10 +526,10 @@ uno::Any SAL_CALL Content::execute(
if ( !( aCommand.Argument >>= aArg ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"Wrong argument type!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -583,10 +583,10 @@ uno::Any SAL_CALL Content::execute(
if ( !( aCommand.Argument >>= aInfo ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"Wrong argument type!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -605,10 +605,10 @@ uno::Any SAL_CALL Content::execute(
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
+ lang::IllegalArgumentException(
"Wrong argument type!",
static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
+ -1 ),
Environment );
// Unreachable
}
@@ -648,9 +648,9 @@ uno::Any SAL_CALL Content::execute(
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::UnsupportedCommandException(
+ ucb::UnsupportedCommandException(
OUString(),
- static_cast< cppu::OWeakObject * >( this ) ) ),
+ static_cast< cppu::OWeakObject * >( this ) ),
Environment );
// Unreachable
}
@@ -1418,10 +1418,10 @@ uno::Any Content::open(
{
// Currently(?) unsupported.
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::UnsupportedOpenModeException(
+ ucb::UnsupportedOpenModeException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
- sal_Int16( rArg.Mode ) ) ),
+ sal_Int16( rArg.Mode ) ),
xEnv );
// Unreachable
}
@@ -1522,11 +1522,10 @@ uno::Any Content::open(
// implementation. Support for this type of
// sink is optional...
ucbhelper::cancelCommandExecution(
- uno::makeAny(
- ucb::UnsupportedDataSinkException(
+ ucb::UnsupportedDataSinkException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
- rArg.Sink ) ),
+ rArg.Sink ),
xEnv );
// Unreachable
}
@@ -1559,9 +1558,9 @@ void Content::insert(
if ( !xStream.is() )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::MissingInputStreamException(
+ ucb::MissingInputStreamException(
OUString(),
- static_cast< cppu::OWeakObject * >( this ) ) ),
+ static_cast< cppu::OWeakObject * >( this ) ),
xEnv );
// Unreachable
}
@@ -1586,11 +1585,11 @@ void Content::insert(
if ( hasData( aNewUri ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::NameClashException(
+ ucb::NameClashException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
task::InteractionClassification_ERROR,
- m_aProps.aTitle ) ),
+ m_aProps.aTitle ),
xEnv );
// Unreachable
}
@@ -1618,12 +1617,11 @@ void Content::insert(
if ( nTry == 1000 )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny(
- ucb::UnsupportedNameClashException(
+ ucb::UnsupportedNameClashException(
"Unable to resolve name clash!",
static_cast< cppu::OWeakObject * >( this ),
- nNameClashResolve ) ),
- xEnv );
+ nNameClashResolve ),
+ xEnv );
// Unreachable
}
else
@@ -1640,11 +1638,10 @@ void Content::insert(
if ( hasData( aNewUri ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny(
- ucb::UnsupportedNameClashException(
+ ucb::UnsupportedNameClashException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
- nNameClashResolve ) ),
+ nNameClashResolve ),
xEnv );
// Unreachable
}
@@ -1709,9 +1706,9 @@ void Content::destroy(
if ( m_eState != PERSISTENT )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::UnsupportedCommandException(
+ ucb::UnsupportedCommandException(
"Not persistent!",
- static_cast< cppu::OWeakObject * >( this ) ) ),
+ static_cast< cppu::OWeakObject * >( this ) ),
xEnv );
// Unreachable
}
@@ -1750,9 +1747,9 @@ void Content::transfer(
if ( m_eState != PERSISTENT )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::UnsupportedCommandException(
+ ucb::UnsupportedCommandException(
"Not persistent!",
- static_cast< cppu::OWeakObject * >( this ) ) ),
+ static_cast< cppu::OWeakObject * >( this ) ),
xEnv );
// Unreachable
}
@@ -1763,9 +1760,9 @@ void Content::transfer(
m_aUri.getUri(), PACKAGE_URL_SCHEME_LENGTH + 3 ) != 0 ) )
{
ucbhelper::cancelCommandExecution(
- uno::makeAny( ucb::InteractiveBadTransferURLException(
+ ucb::InteractiveBadTransferURLException(
OUString(),
- static_cast< cppu::OWeakObject * >( this ) ) ),
+ static_cast< cppu::OWeakObject * >( this ) ),
xEnv );
// Unreachable
}