summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/tdoc
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/tdoc')
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx148
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.cxx6
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx16
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx18
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.cxx55
5 files changed, 106 insertions, 137 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index 61eb808e15d0..0ebf3729b26a 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -110,30 +110,28 @@ uno::Sequence< beans::Property > Content::getProperties(
// Mandatory properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+ rtl::OUString( "ContentType" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+ rtl::OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+ rtl::OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+ rtl::OUString( "Title" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
@@ -142,8 +140,8 @@ uno::Sequence< beans::Property > Content::getProperties(
// Optional standard properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "CreatableContentsInfo" ) ),
+ rtl::OUString(
+ "CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -170,30 +168,28 @@ uno::Sequence< beans::Property > Content::getProperties(
// Mandatory properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+ rtl::OUString( "ContentType" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+ rtl::OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+ rtl::OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+ rtl::OUString( "Title" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
@@ -202,8 +198,8 @@ uno::Sequence< beans::Property > Content::getProperties(
// Optional standard properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "CreatableContentsInfo" ) ),
+ rtl::OUString(
+ "CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -214,7 +210,7 @@ uno::Sequence< beans::Property > Content::getProperties(
// New properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Storage" ) ),
+ rtl::OUString( "Storage" ),
-1,
getCppuType( static_cast<
const uno::Reference< embed::XStorage > * >( 0 ) ),
@@ -238,30 +234,28 @@ uno::Sequence< beans::Property > Content::getProperties(
// Mandatory properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+ rtl::OUString( "ContentType" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+ rtl::OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+ rtl::OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+ rtl::OUString( "Title" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
@@ -271,8 +265,8 @@ uno::Sequence< beans::Property > Content::getProperties(
// Optional standard properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "CreatableContentsInfo" ) ),
+ rtl::OUString(
+ "CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -283,7 +277,7 @@ uno::Sequence< beans::Property > Content::getProperties(
// New properties
///////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentModel" ) ),
+ rtl::OUString( "DocumentModel" ),
-1,
getCppuType( static_cast<
const uno::Reference< frame::XModel > * >( 0 ) ),
@@ -309,28 +303,28 @@ uno::Sequence< beans::Property > Content::getProperties(
// Mandatory properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+ rtl::OUString( "ContentType" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+ rtl::OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+ rtl::OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
),
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+ rtl::OUString( "Title" ),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
@@ -340,8 +334,8 @@ uno::Sequence< beans::Property > Content::getProperties(
// Optional standard properties
///////////////////////////////////////////////////////////////
beans::Property(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "CreatableContentsInfo" ) ),
+ rtl::OUString(
+ "CreatableContentsInfo" ),
-1,
getCppuType( static_cast<
const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -383,27 +377,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Mandatory commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+ rtl::OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+ rtl::OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+ rtl::OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ rtl::OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -413,12 +403,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ),
+ rtl::OUString( "delete" ),
-1,
getCppuBooleanType()
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+ rtl::OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
@@ -442,27 +432,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Mandatory commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+ rtl::OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+ rtl::OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+ rtl::OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ rtl::OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -472,17 +458,17 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ),
+ rtl::OUString( "delete" ),
-1,
getCppuBooleanType()
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ),
+ rtl::OUString( "insert" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+ rtl::OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
@@ -507,27 +493,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Mandatory commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+ rtl::OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+ rtl::OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+ rtl::OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ rtl::OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -537,29 +519,28 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ),
+ rtl::OUString( "delete" ),
-1,
getCppuBooleanType()
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ),
+ rtl::OUString( "insert" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+ rtl::OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ),
+ rtl::OUString( "transfer" ),
-1,
getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ),
+ rtl::OUString( "createNewContent" ),
-1,
getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
)
@@ -583,27 +564,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Mandatory commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+ rtl::OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+ rtl::OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+ rtl::OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ rtl::OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -613,19 +590,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+ rtl::OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ),
+ rtl::OUString( "transfer" ),
-1,
getCppuType( static_cast< ucb::TransferInfo * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "createNewContent" ) ),
+ rtl::OUString( "createNewContent" ),
-1,
getCppuType( static_cast< ucb::ContentInfo * >( 0 ) )
)
@@ -651,27 +627,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Mandatory commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+ rtl::OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+ rtl::OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+ rtl::OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< uno::Sequence< beans::Property > * >( 0 ) )
),
ucb::CommandInfo(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ rtl::OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast<
@@ -681,7 +653,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
// Optional standard commands
///////////////////////////////////////////////////////////
ucb::CommandInfo(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+ rtl::OUString( "open" ),
-1,
getCppuType(
static_cast< ucb::OpenCommandArgument2 * >( 0 ) )
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 19f35caaa349..b0e03e8ac664 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -76,8 +76,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin
{
document::EventObject aDocEvent;
aDocEvent.Source = Source.Source;
- aDocEvent.EventName = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "OfficeDocumentsListener::notifyClosing" ) );
+ aDocEvent.EventName = rtl::OUString( "OfficeDocumentsListener::notifyClosing" );
m_pManager->notifyEvent( aDocEvent );
}
@@ -147,8 +146,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc )
try
{
uno::Any aValue = xPropSet->getPropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "RuntimeUID" ) ) );
+ rtl::OUString( "RuntimeUID" ) );
aValue >>= aId;
}
catch ( beans::UnknownPropertyException const & )
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index 8c7b5859c9fb..dca9415f4bd8 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -93,8 +93,8 @@ DocumentContentFactory::getSupportedServiceNames()
// static
rtl::OUString DocumentContentFactory::getImplementationName_Static()
{
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" ) );
+ return rtl::OUString(
+ "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" );
}
//=========================================================================
@@ -104,8 +104,8 @@ DocumentContentFactory::getSupportedServiceNames_Static()
{
uno::Sequence< rtl::OUString > aSNS( 1 );
aSNS.getArray()[ 0 ]
- = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ) );
+ = rtl::OUString(
+ "com.sun.star.frame.TransientDocumentsDocumentContentFactory" );
return aSNS;
}
@@ -127,8 +127,8 @@ DocumentContentFactory::createDocumentContent(
xDocFac
= uno::Reference< frame::XTransientDocumentsDocumentContentFactory >(
m_xSMgr->createInstance(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.TransientDocumentsContentProvider" ) )
+ rtl::OUString(
+ "com.sun.star.ucb.TransientDocumentsContentProvider" )
),
uno::UNO_QUERY );
}
@@ -141,8 +141,8 @@ DocumentContentFactory::createDocumentContent(
return xDocFac->createDocumentContent( Model );
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Unable to obtain document content factory!" ) ),
+ rtl::OUString(
+ "Unable to obtain document content factory!" ),
static_cast< cppu::OWeakObject * >( this ) );
}
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 7a9c223a04c5..6993d2e143ab 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -97,8 +97,8 @@ XTYPEPROVIDER_IMPL_4( ContentProvider,
XSERVICEINFO_IMPL_1_CTX(
ContentProvider,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) ),
+ rtl::OUString(
+ "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
TDOC_CONTENT_PROVIDER_SERVICE_NAME ) ) );
@@ -125,7 +125,7 @@ ContentProvider::queryContent(
Uri aUri( Identifier->getContentIdentifier() );
if ( !aUri.isValid() )
throw ucb::IllegalIdentifierException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid URL!" ) ),
+ rtl::OUString( "Invalid URL!" ),
Identifier );
// Normalize URI.
@@ -190,16 +190,16 @@ ContentProvider::createDocumentContent(
// no content.
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Illegal Content Identifier!" ) ),
+ rtl::OUString(
+ "Illegal Content Identifier!" ),
static_cast< cppu::OWeakObject * >( this ),
1 );
}
else
{
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Unable to obtain document id from model!" ) ),
+ rtl::OUString(
+ "Unable to obtain document id from model!" ),
static_cast< cppu::OWeakObject * >( this ),
1 );
}
@@ -207,8 +207,8 @@ ContentProvider::createDocumentContent(
else
{
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "No Document Manager!" ) ),
+ rtl::OUString(
+ "No Document Manager!" ),
static_cast< cppu::OWeakObject * >( this ),
1 );
}
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index e31a877796f2..5b84469822c6 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -98,8 +98,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri,
( eMode != READ_WRITE_NOCREATE ) &&
( eMode != READ_WRITE_CREATE ) )
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Invalid open mode!" ) ),
+ rtl::OUString(
+ "Invalid open mode!" ),
uno::Reference< uno::XInterface >(),
sal_Int16( 2 ) );
@@ -107,8 +107,8 @@ StorageElementFactory::createStorage( const rtl::OUString & rUri,
if ( aUri.isRoot() )
{
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Root never has a storage!" ) ),
+ rtl::OUString(
+ "Root never has a storage!" ),
uno::Reference< uno::XInterface >(),
sal_Int16( 1 ) );
}
@@ -420,8 +420,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
sal_Int16( 2 ) );
else
throw embed::InvalidStorageException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Invalid document id!" ) ),
+ rtl::OUString(
+ "Invalid document id!" ),
uno::Reference< uno::XInterface >() );
}
@@ -435,8 +435,7 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
try
{
uno::Any aPropValue = xPropSet->getPropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "OpenMode" ) ) );
+ rtl::OUString( "OpenMode" ) );
sal_Int32 nOpenMode = 0;
if ( aPropValue >>= nOpenMode )
@@ -448,8 +447,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
{
// document opened, but not readable.
throw embed::InvalidStorageException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Storage is open, but not readable!" ) ),
+ rtl::OUString(
+ "Storage is open, but not readable!" ),
uno::Reference< uno::XInterface >() );
}
// storage okay
@@ -461,8 +460,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
{
// document opened, but not writable.
throw embed::InvalidStorageException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Storage is open, but not writable!" ) ),
+ rtl::OUString(
+ "Storage is open, but not writable!" ),
uno::Reference< uno::XInterface >() );
}
// storage okay
@@ -475,8 +474,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
"Bug! Value of property OpenMode has wrong type!" );
throw uno::RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Bug! Value of property OpenMode has wrong type!" ) ),
+ rtl::OUString(
+ "Bug! Value of property OpenMode has wrong type!" ),
uno::Reference< uno::XInterface >() );
}
}
@@ -485,8 +484,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
OSL_FAIL( "Property OpenMode not supported!" );
throw embed::StorageWrappedTargetException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Bug! Value of property OpenMode has wrong type!" ) ),
+ rtl::OUString(
+ "Bug! Value of property OpenMode has wrong type!" ),
uno::Reference< uno::XInterface >(),
uno::makeAny( e ) );
}
@@ -495,8 +494,8 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
OSL_FAIL( "Caught WrappedTargetException!" );
throw embed::StorageWrappedTargetException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "WrappedTargetException during getPropertyValue!" ) ),
+ rtl::OUString(
+ "WrappedTargetException during getPropertyValue!" ),
uno::Reference< uno::XInterface >(),
uno::makeAny( e ) );
}
@@ -559,8 +558,8 @@ StorageElementFactory::queryStream(
if ( !xParentStorage.is() )
{
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "No parent storage!" ) ),
+ rtl::OUString(
+ "No parent storage!" ),
uno::Reference< uno::XInterface >(),
sal_Int16( 2 ) );
}
@@ -569,16 +568,16 @@ StorageElementFactory::queryStream(
if ( aUri.isRoot() )
{
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Root never is a stream!" ) ),
+ rtl::OUString(
+ "Root never is a stream!" ),
uno::Reference< uno::XInterface >(),
sal_Int16( 2 ) );
}
else if ( aUri.isDocument() )
{
throw lang::IllegalArgumentException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "A document never is a stream!" ) ),
+ rtl::OUString(
+ "A document never is a stream!" ),
uno::Reference< uno::XInterface >(),
sal_Int16( 2 ) );
}
@@ -615,8 +614,8 @@ StorageElementFactory::queryStream(
OSL_FAIL( "StorageElementFactory::queryStream : Unknown open mode!" );
throw embed::InvalidStorageException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Unknown open mode!" ) ),
+ rtl::OUString(
+ "Unknown open mode!" ),
uno::Reference< uno::XInterface >() );
}
@@ -672,8 +671,8 @@ StorageElementFactory::queryStream(
if ( !xStream.is() )
{
throw embed::InvalidStorageException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "No stream!" ) ),
+ rtl::OUString(
+ "No stream!" ),
uno::Reference< uno::XInterface >() );
}
generated by cgit (git 2.34.1) at 2024-07-25 09:00:14 +0000