[Libreoffice-commits] .: ucb/source ucb/workben vbahelper/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Thu May 31 19:15:08 PDT 2012
ucb/source/cacher/cachedcontentresultset.cxx | 25 --
ucb/source/cacher/cachedcontentresultsetstub.cxx | 16 -
ucb/source/cacher/cacheddynamicresultset.cxx | 12
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 15 -
ucb/source/cacher/contentresultsetwrapper.cxx | 2
ucb/source/core/provprox.cxx | 12
ucb/source/core/ucb.cxx | 18 -
ucb/source/core/ucbcmds.cxx | 216 ++++++-----------
ucb/source/core/ucbprops.cxx | 6
ucb/source/core/ucbstore.cxx | 134 ++++------
ucb/source/sorter/sortdynres.cxx | 17 -
ucb/source/sorter/sortresult.cxx | 16 -
ucb/source/ucp/ext/ucpext_content.cxx | 40 +--
ucb/source/ucp/ext/ucpext_provider.cxx | 12
ucb/source/ucp/file/bc.cxx | 34 +-
ucb/source/ucp/file/filglob.cxx | 132 +++-------
ucb/source/ucp/file/filinsreq.cxx | 10
ucb/source/ucp/file/filrow.cxx | 40 +--
ucb/source/ucp/file/filrset.cxx | 50 ++--
ucb/source/ucp/file/filstr.cxx | 27 --
ucb/source/ucp/file/prov.cxx | 16 -
ucb/source/ucp/file/shell.cxx | 91 +++----
ucb/source/ucp/ftp/ftpcontent.cxx | 50 +---
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 2
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 11
ucb/source/ucp/ftp/ftpresultsetI.cxx | 3
ucb/source/ucp/ftp/ftpresultsetbase.cxx | 20 -
ucb/source/ucp/ftp/ftpurl.cxx | 18 -
ucb/source/ucp/ftp/test_ftpurl.cxx | 9
ucb/source/ucp/gio/gio_content.cxx | 72 ++---
ucb/source/ucp/gio/gio_datasupplier.cxx | 4
ucb/source/ucp/gio/gio_provider.cxx | 6
ucb/source/ucp/gvfs/gvfs_content.cxx | 81 +++---
ucb/source/ucp/gvfs/gvfs_directory.cxx | 2
ucb/source/ucp/gvfs/gvfs_provider.cxx | 6
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 175 +++++---------
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 8
ucb/source/ucp/hierarchy/hierarchydata.cxx | 67 ++---
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 48 +--
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx | 2
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 22 -
ucb/source/ucp/hierarchy/hierarchyuri.cxx | 35 +-
ucb/source/ucp/odma/odma_content.cxx | 47 +--
ucb/source/ucp/odma/odma_provider.cxx | 15 -
ucb/source/ucp/package/pkgcontent.cxx | 129 +++-------
ucb/source/ucp/package/pkgdatasupplier.cxx | 4
ucb/source/ucp/package/pkgprovider.cxx | 9
ucb/source/ucp/tdoc/tdoc_content.cxx | 259 +++++++--------------
ucb/source/ucp/tdoc/tdoc_content.hxx | 8
ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 2
ucb/source/ucp/tdoc/tdoc_uri.cxx | 2
ucb/source/ucp/webdav/ContentProperties.cxx | 56 ++--
ucb/source/ucp/webdav/DAVProperties.cxx | 34 +-
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 43 +--
ucb/source/ucp/webdav/LinkSequence.cxx | 6
ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 2
ucb/source/ucp/webdav/NeonSession.cxx | 16 -
ucb/source/ucp/webdav/NeonUri.cxx | 4
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 26 +-
ucb/source/ucp/webdav/webdavcontent.cxx | 169 +++++--------
ucb/source/ucp/webdav/webdavdatasupplier.cxx | 12
ucb/source/ucp/webdav/webdavprovider.cxx | 17 -
ucb/workben/ucb/ucbdemo.cxx | 121 ++++-----
vbahelper/source/vbahelper/vbahelper.cxx | 2
64 files changed, 1070 insertions(+), 1495 deletions(-)
New commits:
commit 827865fee1dba85d4c3f986a23e4bd34b1a641f9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu May 31 20:45:03 2012 -0500
targeted string re-work
Change-Id: Ic08995a67a407576da475a6716b1218e45b60dfd
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 4c66b38..e08b657 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -443,10 +443,10 @@ public:
throw( RuntimeException );
};
-OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( RTL_CONSTASCII_USTRINGPARAM("RowCount") );
-OUString CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal") );
-OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( RTL_CONSTASCII_USTRINGPARAM("FetchSize") );
-OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") );
+OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( "RowCount" );
+OUString CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( "IsRowCountFinal" );
+OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( "FetchSize" );
+OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( "FetchDirection" );
CCRS_PropertySetInfo::CCRS_PropertySetInfo(
Reference< XPropertySetInfo > xInfo )
@@ -971,10 +971,10 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedContentResultSet" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_CONTENT_RESULTSET_SERVICE_NAME )) );
+ OUString(
+ "com.sun.star.comp.ucb.CachedContentResultSet" ),
+ OUString(
+ CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// XPropertySet methods. ( inherited )
@@ -2150,8 +2150,7 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
m_bTriedToGetTypeConverter = sal_True;
m_xTypeConverter = Reference< XTypeConverter >(
m_xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.script.Converter" )) ),
+ OUString( "com.sun.star.script.Converter" ) ),
UNO_QUERY );
OSL_ENSURE( m_xTypeConverter.is(),
@@ -2200,10 +2199,8 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedContentResultSetFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedContentResultSetFactory" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_CONTENT_RESULTSET_FACTORY_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
+ OUString( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index b32a8b6..a3e858c 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -50,8 +50,8 @@ CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet >
, m_bFirstFetchSizePropagationDone( sal_False )
, m_nLastFetchSize( 1 )//this value is not important at all
, m_bLastFetchDirection( sal_True )//this value is not important at all
- , m_aPropertyNameForFetchSize( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchSize")) )
- , m_aPropertyNameForFetchDirection( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchDirection")) )
+ , m_aPropertyNameForFetchSize( OUString("FetchSize") )
+ , m_aPropertyNameForFetchDirection( OUString("FetchDirection") )
{
impl_init();
}
@@ -172,10 +172,8 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedContentResultSetStub" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_CRS_STUB_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
+ OUString( CACHED_CRS_STUB_SERVICE_NAME ) );
//-----------------------------------------------------------------
// XFetchProvider methods.
@@ -531,10 +529,8 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_CRS_STUB_FACTORY_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
+ OUString( CACHED_CRS_STUB_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 506c96f..9075adc 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -120,10 +120,8 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedDynamicResultSet" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_DRS_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
+ OUString( CACHED_DRS_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// own methds. ( inherited )
@@ -176,10 +174,8 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_DRS_FACTORY_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
+ OUString( CACHED_DRS_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 4bc1840..01404c2 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -122,10 +122,8 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedDynamicResultSetStub" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_DRS_STUB_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
+ OUString( CACHED_DRS_STUB_SERVICE_NAME ) );
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
@@ -166,10 +164,8 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- CACHED_DRS_STUB_FACTORY_NAME )) );
+ OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
+ OUString( CACHED_DRS_STUB_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
@@ -216,8 +212,7 @@ void SAL_CALL CachedDynamicResultSetStubFactory
try
{
xSortFactory = Reference< XSortedDynamicResultSetFactory >(
- m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.SortedDynamicResultSetFactory" )) ),
+ m_xSMgr->createInstance( OUString( "com.sun.star.ucb.SortedDynamicResultSetFactory" ) ),
UNO_QUERY );
}
catch ( Exception const & )
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 6b0c433..a31ed07 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -319,7 +319,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
}
aGuard.reacquire();
- OUString aName(RTL_CONSTASCII_USTRINGPARAM("ResultSetType"));
+ OUString aName("ResultSetType");
//find out, if we are ForwardOnly and cache the value:
impl_init_xPropertySetOrigin();
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index f8ef7a0..ec51642 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -87,10 +87,8 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- PROVIDER_FACTORY_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ),
+ OUString( PROVIDER_FACTORY_SERVICE_NAME ) );
//=========================================================================
//
@@ -215,10 +213,8 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.UcbContentProviderProxy" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- PROVIDER_PROXY_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ),
+ OUString( PROVIDER_PROXY_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 417cd4a..64a412b 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -347,10 +347,8 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
//=========================================================================
XSERVICEINFO_IMPL_1( UniversalContentBroker,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.UniversalContentBroker" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- UCB_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ),
+ OUString( UCB_SERVICE_NAME ) );
//=========================================================================
//
@@ -651,8 +649,7 @@ Any SAL_CALL UniversalContentBroker::execute(
{
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Wrong argument type!" )),
+ OUString( "Wrong argument type!" ),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -834,8 +831,8 @@ bool UniversalContentBroker::getContentProviderData(
{
uno::Reference< lang::XMultiServiceFactory > xConfigProv(
m_xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider" )) ),
+ OUString(
+ "com.sun.star.configuration.ConfigurationProvider" ) ),
uno::UNO_QUERY_THROW );
OUStringBuffer aFullPath;
@@ -848,14 +845,13 @@ bool UniversalContentBroker::getContentProviderData(
uno::Sequence< uno::Any > aArguments( 1 );
beans::PropertyValue aProperty;
aProperty.Name
- = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
+ = OUString( "nodepath" );
aProperty.Value <<= aFullPath.makeStringAndClear();
aArguments[ 0 ] <<= aProperty;
uno::Reference< uno::XInterface > xInterface(
xConfigProv->createInstanceWithArguments(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationAccess" ) ),
+ OUString( "com.sun.star.configuration.ConfigurationAccess" ),
aArguments ) );
if ( !m_xNotifier.is() )
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index e8eeb48..221a429 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -247,12 +247,12 @@ CommandProcessorInfo::CommandProcessorInfo()
(*m_pInfo)[ 0 ]
= ucb::CommandInfo(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GETCOMMANDINFO_NAME )), // Name
+ rtl::OUString( GETCOMMANDINFO_NAME ), // Name
GETCOMMANDINFO_HANDLE, // Handle
getCppuVoidType() ); // ArgType
(*m_pInfo)[ 1 ]
= ucb::CommandInfo(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GLOBALTRANSFER_NAME )), // Name
+ rtl::OUString( GLOBALTRANSFER_NAME ), // Name
GLOBALTRANSFER_HANDLE, // Handle
getCppuType(
static_cast<
@@ -486,12 +486,12 @@ bool setTitle(
{
uno::Sequence< beans::PropertyValue > aPropValues( 1 );
aPropValues[ 0 ].Name
- = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+ = rtl::OUString( "Title" );
aPropValues[ 0 ].Handle = -1;
aPropValues[ 0 ].Value = uno::makeAny( rNewTitle );
ucb::Command aSetPropsCommand(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ rtl::OUString( "setPropertyValues" ),
-1,
uno::makeAny( aPropValues ) );
@@ -547,8 +547,7 @@ uno::Reference< ucb::XContent > createNew(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Folder")),
+ rtl::OUString( "Folder"),
-1,
uno::makeAny(rContext.aArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -556,19 +555,19 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Target is no XCommandProcessor!")),
+ rtl::OUString("Target is no XCommandProcessor!"),
rContext.xProcessor );
// Unreachable
}
uno::Sequence< beans::Property > aPropsToObtain( 1 );
aPropsToObtain[ 0 ].Name
- = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo"));
+ = rtl::OUString("CreatableContentsInfo");
aPropsToObtain[ 0 ].Handle
= -1;
ucb::Command aGetPropsCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
+ rtl::OUString("getPropertyValues"),
-1,
uno::makeAny( aPropsToObtain ) );
@@ -601,8 +600,7 @@ uno::Reference< ucb::XContent > createNew(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Folder")),
+ rtl::OUString( "Folder"),
-1,
uno::makeAny(rContext.aArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -610,7 +608,7 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Target is no XContentCreator!")),
+ rtl::OUString("Target is no XContentCreator!"),
rContext.xProcessor );
// Unreachable
}
@@ -623,7 +621,7 @@ uno::Reference< ucb::XContent > createNew(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Folder")),
+ rtl::OUString("Folder"),
-1,
uno::makeAny(rContext.aArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -631,7 +629,7 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No types creatable!")),
+ rtl::OUString("No types creatable!"),
rContext.xProcessor );
// Unreachable
}
@@ -697,8 +695,7 @@ uno::Reference< ucb::XContent > createNew(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unknown transfer operation!" )),
+ rtl::OUString( "Unknown transfer operation!" ),
rContext.xProcessor,
-1 ) ),
rContext.xOrigEnv );
@@ -718,7 +715,7 @@ uno::Reference< ucb::XContent > createNew(
// First, try it using "CreatabeleContentsInfo" property and
// "createNewContent" command -> the "new" way.
ucb::Command aCreateNewCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")),
+ rtl::OUString("createNewContent"),
-1,
uno::makeAny( aTypesInfo[ n ] ) );
@@ -738,8 +735,7 @@ uno::Reference< ucb::XContent > createNew(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Folder")),
+ rtl::OUString( "Folder"),
-1,
uno::makeAny(rContext.aArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -747,8 +743,7 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "createNewContent failed!" )),
+ rtl::OUString( "createNewContent failed!" ),
rContext.xProcessor );
// Unreachable
}
@@ -767,7 +762,7 @@ void transferProperties(
throw( uno::Exception )
{
ucb::Command aGetPropertySetInfoCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo")),
+ rtl::OUString("getPropertySetInfo"),
-1,
uno::Any() );
@@ -779,8 +774,7 @@ void transferProperties(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rContext.aArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -788,8 +782,7 @@ void transferProperties(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get propertyset info from source object!" )),
+ rtl::OUString( "Unable to get propertyset info from source object!" ),
rContext.xProcessor );
// Unreachable
}
@@ -797,7 +790,7 @@ void transferProperties(
uno::Sequence< beans::Property > aAllProps = xInfo->getProperties();
ucb::Command aGetPropsCommand1(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
+ rtl::OUString("getPropertyValues"),
-1,
uno::makeAny( aAllProps ) );
@@ -809,8 +802,7 @@ void transferProperties(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rContext.aArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -818,8 +810,7 @@ void transferProperties(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get properties from source object!" )),
+ rtl::OUString( "Unable to get properties from source object!" ),
rContext.xProcessor );
// Unreachable
}
@@ -890,7 +881,7 @@ void transferProperties(
if ( !bHasTitle && !rContext.aArg.NewTitle.isEmpty() )
{
aPropValues[ nWritePos ].Name
- = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ = rtl::OUString("Title");
aPropValues[ nWritePos ].Handle = -1;
aPropValues[ nWritePos ].Value <<= rContext.aArg.NewTitle;
@@ -902,7 +893,7 @@ void transferProperties(
== ucb::TransferCommandOperation_LINK ) )
{
aPropValues[ nWritePos ].Name
- = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
+ = rtl::OUString("TargetURL");
aPropValues[ nWritePos ].Handle = -1;
aPropValues[ nWritePos ].Value <<= rContext.aArg.SourceURL;
@@ -914,7 +905,7 @@ void transferProperties(
// Set properties at new object.
ucb::Command aSetPropsCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")),
+ rtl::OUString("setPropertyValues"),
-1,
uno::makeAny( aPropValues ) );
@@ -949,7 +940,7 @@ uno::Reference< io::XInputStream > getInputStream(
aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused
ucb::Command aOpenCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
+ rtl::OUString("open"),
-1,
uno::makeAny( aArg ) );
@@ -977,7 +968,7 @@ uno::Reference< io::XInputStream > getInputStream(
{
uno::Reference< io::XOutputStream > xOutputStream(
rContext.xSMgr->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")) ),
+ rtl::OUString("com.sun.star.io.Pipe") ),
uno::UNO_QUERY );
if ( xOutputStream.is() )
@@ -989,7 +980,7 @@ uno::Reference< io::XInputStream > getInputStream(
aArg.Properties = uno::Sequence< beans::Property >( 0 );
ucb::Command aOpenCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
+ rtl::OUString("open"),
-1,
uno::makeAny( aArg ) );
@@ -1022,11 +1013,11 @@ uno::Reference< sdbc::XResultSet > getResultSet(
uno::Sequence< beans::Property > aProps( 3 );
- aProps[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
+ aProps[ 0 ].Name = rtl::OUString("IsFolder");
aProps[ 0 ].Handle = -1; /* unknown */
- aProps[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
+ aProps[ 1 ].Name = rtl::OUString("IsDocument");
aProps[ 1 ].Handle = -1; /* unknown */
- aProps[ 2 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
+ aProps[ 2 ].Name = rtl::OUString("TargetURL");
aProps[ 2 ].Handle = -1; /* unknown */
ucb::OpenCommandArgument2 aArg;
@@ -1035,7 +1026,7 @@ uno::Reference< sdbc::XResultSet > getResultSet(
aArg.Sink = 0;
aArg.Properties = aProps;
- ucb::Command aOpenCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
+ ucb::Command aOpenCommand( rtl::OUString("open"),
-1,
uno::makeAny( aArg ) );
try
@@ -1073,11 +1064,11 @@ void handleNameClashRename(
// Obtain old title.
uno::Sequence< beans::Property > aProps( 1 );
- aProps[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ aProps[ 0 ].Name = rtl::OUString("Title");
aProps[ 0 ].Handle = -1;
ucb::Command aGetPropsCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
+ rtl::OUString("getPropertyValues"),
-1,
uno::makeAny( aProps ) );
@@ -1089,7 +1080,7 @@ void handleNameClashRename(
uno::Any aProps2
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ),
+ rtl::OUString( "Uri" ),
-1,
uno::makeAny(
xNew->getIdentifier()->getContentIdentifier() ),
@@ -1098,8 +1089,7 @@ void handleNameClashRename(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >( &aProps2, 1 ),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get properties from new object!" )),
+ rtl::OUString( "Unable to get properties from new object!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1109,9 +1099,7 @@ void handleNameClashRename(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get property 'Title' "
- "from new object!" )),
+ rtl::OUString( "Unable to get property 'Title' from new object!" ),
rContext.xProcessor ) ),
rContext.xOrigEnv );
// Unreachable
@@ -1130,7 +1118,7 @@ void handleNameClashRename(
aOldTitlePre = aOldTitle;
if ( nPos > 0 )
- aOldTitlePre += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
+ aOldTitlePre += rtl::OUString("_");
sal_Bool bContinue = sal_True;
do
@@ -1180,8 +1168,7 @@ void handleNameClashRename(
uno::Any aProps2
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ),
+ rtl::OUString( "Uri" ),
-1,
uno::makeAny(
xNew->getIdentifier()->
@@ -1191,8 +1178,7 @@ void handleNameClashRename(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >( &aProps2, 1 ),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Got no data stream from source!" )),
+ rtl::OUString( "Got no data stream from source!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1204,7 +1190,7 @@ void handleNameClashRename(
aArg.ReplaceExisting = sal_False;
ucb::Command aInsertCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
+ rtl::OUString("insert"),
-1,
uno::makeAny( aArg ) );
@@ -1228,8 +1214,7 @@ void handleNameClashRename(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to resolve name clash!" )),
+ rtl::OUString( "Unable to resolve name clash!" ),
rContext.xProcessor,
ucb::NameClash::RENAME ) ),
rContext.xOrigEnv );
@@ -1251,9 +1236,8 @@ void globalTransfer_(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get property 'IsFolder' "
- "from source object!" )),
+ rtl::OUString( "Unable to get property 'IsFolder' "
+ "from source object!" ),
rContext.xProcessor ) ),
rContext.xOrigEnv );
// Unreachable
@@ -1265,9 +1249,8 @@ void globalTransfer_(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( beans::UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get property 'IsDocument' "
- "from source object!" )),
+ rtl::OUString( "Unable to get property 'IsDocument' "
+ "from source object!" ),
rContext.xProcessor ) ),
rContext.xOrigEnv );
// Unreachable
@@ -1292,8 +1275,7 @@ void globalTransfer_(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Folder")),
+ rtl::OUString( "Folder"),
-1,
uno::makeAny(rContext.aArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1301,8 +1283,7 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "No matching content type at target!" )),
+ rtl::OUString( "No matching content type at target!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1319,8 +1300,7 @@ void globalTransfer_(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(
xNew->getIdentifier()->
@@ -1330,8 +1310,7 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "New content is not a XCommandProcessor!" )),
+ rtl::OUString( "New content is not a XCommandProcessor!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1344,8 +1323,7 @@ void globalTransfer_(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rContext.aArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1353,8 +1331,7 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Source content is not a XCommandProcessor!" )),
+ rtl::OUString( "Source content is not a XCommandProcessor!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1423,7 +1400,7 @@ void globalTransfer_(
try
{
ucb::Command aInsertCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
+ rtl::OUString("insert"),
-1,
uno::makeAny( aArg ) );
@@ -1441,9 +1418,9 @@ void globalTransfer_(
// No chance to solve name clashes, because I'm not able to detect
// whether there is one.
throw ucb::UnsupportedNameClashException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"Unable to resolve name clashes, no chance to detect "
- "that there is one!" )),
+ "that there is one!" ),
rContext.xProcessor,
rContext.aArg.NameClash );
}
@@ -1469,9 +1446,9 @@ void globalTransfer_(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"BUG: insert + replace == true MUST NOT "
- "throw NameClashException." )),
+ "throw NameClashException." ),
rContext.xProcessor,
rContext.aArg.NameClash ) ),
rContext.xOrigEnv );
@@ -1518,9 +1495,8 @@ void globalTransfer_(
case ABORT:
throw ucb::CommandFailedException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"abort requested via interaction "
- "handler" ) ),
+ "handler" ),
uno::Reference< uno::XInterface >(),
aExc );
// break;
@@ -1550,10 +1526,7 @@ void globalTransfer_(
{
// error setting title. Abort.
throw ucb::CommandFailedException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "error setting Title property!"
- ) ),
+ rtl::OUString( "error setting Title property!" ),
uno::Reference< uno::XInterface >(),
aExc );
}
@@ -1572,9 +1545,8 @@ void globalTransfer_(
uno::makeAny(
ucb::UnsupportedNameClashException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"default action, don't know how to "
- "handle name clash" ) ),
+ "handle name clash" ),
rContext.xProcessor,
rContext.aArg.NameClash ) ),
rContext.xOrigEnv );
@@ -1605,8 +1577,7 @@ void globalTransfer_(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rContext.aArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1614,8 +1585,7 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get properties from children of source!" )),
+ rtl::OUString( "Unable to get properties from children of source!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1628,8 +1598,7 @@ void globalTransfer_(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rContext.aArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1637,8 +1606,7 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get children of source!" )),
+ rtl::OUString( "Unable to get children of source!" ),
rContext.xProcessor );
// Unreachable
}
@@ -1694,13 +1662,13 @@ void globalTransfer_(
aAny =
xcp->execute(
ucb::Command(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo")),
+ rtl::OUString("getCommandInfo"),
-1,
uno::Any()),
0,
rContext.xEnv );
- const rtl::OUString cmdName(RTL_CONSTASCII_USTRINGPARAM("flush"));
+ const rtl::OUString cmdName("flush");
if((aAny >>= xci) && xci->hasCommandByName(cmdName))
xcp->execute(
ucb::Command(
@@ -1745,8 +1713,7 @@ void UniversalContentBroker::globalTransfer(
m_xSMgr, uno::UNO_QUERY_THROW );
uno::Reference< uno::XComponentContext > xCtx;
xCtx.set( xProps->getPropertyValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ),
+ rtl::OUString( "DefaultContext" ) ),
uno::UNO_QUERY_THROW );
xLocalEnv.set( ucb::CommandEnvironment::create(
@@ -1779,8 +1746,7 @@ void UniversalContentBroker::globalTransfer(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1788,8 +1754,7 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Can't instanciate target object!" )),
+ rtl::OUString( "Can't instanciate target object!" ),
this );
// Unreachable
}
@@ -1804,8 +1769,7 @@ void UniversalContentBroker::globalTransfer(
uno::Any aProps
= uno::makeAny(
beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rArg.TargetURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1813,8 +1777,7 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Target content is not a XCommandProcessor!" )),
+ rtl::OUString( "Target content is not a XCommandProcessor!" ),
this );
// Unreachable
}
@@ -1834,7 +1797,7 @@ void UniversalContentBroker::globalTransfer(
try
{
ucb::Command aCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), // Name
+ rtl::OUString("transfer"), // Name
-1, // Handle
uno::makeAny( aTransferArg ) ); // Argument
@@ -1870,7 +1833,7 @@ void UniversalContentBroker::globalTransfer(
ucb::NameClash::ERROR );
ucb::Command aCommand1(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
+ rtl::OUString("transfer"),
-1,
uno::makeAny( aTransferArg1 ) );
@@ -1914,9 +1877,8 @@ void UniversalContentBroker::globalTransfer(
case ABORT:
throw ucb::CommandFailedException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"abort requested via interaction "
- "handler" ) ),
+ "handler" ),
uno::Reference< uno::XInterface >(),
aExc );
// break;
@@ -1968,8 +1930,7 @@ void UniversalContentBroker::globalTransfer(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1977,8 +1938,7 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Can't instanciate source object!" )),
+ rtl::OUString( "Can't instanciate source object!" ),
this );
// Unreachable
}
@@ -1989,8 +1949,7 @@ void UniversalContentBroker::globalTransfer(
{
uno::Any aProps
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -1998,8 +1957,7 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Source content is not a XCommandProcessor!" )),
+ rtl::OUString( "Source content is not a XCommandProcessor!" ),
this );
// Unreachable
}
@@ -2008,17 +1966,17 @@ void UniversalContentBroker::globalTransfer(
uno::Sequence< beans::Property > aProps( 4 );
- aProps[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
+ aProps[ 0 ].Name = rtl::OUString("IsFolder");
aProps[ 0 ].Handle = -1; /* unknown */
- aProps[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
+ aProps[ 1 ].Name = rtl::OUString("IsDocument");
aProps[ 1 ].Handle = -1; /* unknown */
- aProps[ 2 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
+ aProps[ 2 ].Name = rtl::OUString("TargetURL");
aProps[ 2 ].Handle = -1; /* unknown */
- aProps[ 3 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI"));
+ aProps[ 3 ].Name = rtl::OUString("BaseURI");
aProps[ 3 ].Handle = -1; /* unknown */
ucb::Command aGetPropsCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
+ rtl::OUString("getPropertyValues"),
-1,
uno::makeAny( aProps ) );
@@ -2029,8 +1987,7 @@ void UniversalContentBroker::globalTransfer(
{
uno::Any aProps2
= uno::makeAny(beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ rtl::OUString( "Uri"),
-1,
uno::makeAny(rArg.SourceURL),
beans::PropertyState_DIRECT_VALUE));
@@ -2038,8 +1995,7 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps2, 1),
xEnv,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to get properties from source object!" )),
+ rtl::OUString( "Unable to get properties from source object!" ),
this );
// Unreachable
}
@@ -2072,7 +2028,7 @@ void UniversalContentBroker::globalTransfer(
try
{
ucb::Command aCommand(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), // Name
+ rtl::OUString("delete"), // Name
-1, // Handle
uno::makeAny( sal_Bool( sal_True ) ) ); // Argument
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index c778bf9..24cb44c 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -357,10 +357,8 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbPropertiesManager,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.UcbPropertiesManager" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- PROPERTIES_MANAGER_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ),
+ OUString( PROPERTIES_MANAGER_SERVICE_NAME ) );
//=========================================================================
//
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 38b4980..4e84798 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -244,10 +244,8 @@ XTYPEPROVIDER_IMPL_4( UcbStore,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbStore,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.UcbStore" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- STORE_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.UcbStore" ),
+ OUString( STORE_SERVICE_NAME ) );
//=========================================================================
//
@@ -383,10 +381,8 @@ XTYPEPROVIDER_IMPL_4( PropertySetRegistry,
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.PropertySetRegistry" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- PROPSET_REG_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.PropertySetRegistry" ),
+ OUString( PROPSET_REG_SERVICE_NAME ) );
//=========================================================================
//
@@ -461,7 +457,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
// // Set Values
// xNameReplace->replaceByName(
-// OUString(RTL_CONSTASCII_USTRINGPARAM("Values")),
+// OUString("Values"),
// makeAny( ... ) );
// Insert new item.
@@ -822,7 +818,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
{
OUString aOldValuesKey
= makeHierarchalNameSegment( rOldKey );
- aOldValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Values"));
+ aOldValuesKey += OUString("/Values");
Reference< XNameAccess > xOldNameAccess;
xRootHierNameAccess->getByHierarchicalName(
@@ -843,7 +839,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
{
OUString aNewValuesKey
= makeHierarchalNameSegment( rNewKey );
- aNewValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Values"));
+ aNewValuesKey += OUString("/Values");
Reference< XSingleServiceFactory > xNewFac;
xRootHierNameAccess->getByHierarchicalName(
@@ -865,12 +861,12 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
return;
}
- aOldValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aOldValuesKey += OUString("/");
- OUString aHandleKey(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
- OUString aValueKey(RTL_CONSTASCII_USTRINGPARAM("/Value"));
- OUString aStateKey(RTL_CONSTASCII_USTRINGPARAM("/State"));
- OUString aAttrKey(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
+ OUString aHandleKey("/Handle");
+ OUString aValueKey("/Value");
+ OUString aStateKey("/State");
+ OUString aAttrKey("/Attributes");
for ( sal_Int32 n = 0; n < nCount; ++n )
{
@@ -900,7 +896,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
+ OUString("Handle"),
aAny );
// ... value
@@ -910,7 +906,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
+ OUString("Value"),
aAny );
// ... state
@@ -920,7 +916,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
+ OUString("State"),
aAny );
// ... attributes
@@ -930,7 +926,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Attributes")),
+ OUString("Attributes"),
aAny );
// Insert new item.
@@ -1052,9 +1048,9 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider()
m_pImpl->m_xConfigProvider
= Reference< XMultiServiceFactory >(
m_xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
+ OUString(
"com.sun.star.configuration."
- "ConfigurationProvider" )) ),
+ "ConfigurationProvider" ) ),
UNO_QUERY_THROW );
}
catch (const Exception&)
@@ -1092,19 +1088,16 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
Sequence< Any > aArguments( 1 );
PropertyValue aProperty;
aProperty.Name
- = OUString( RTL_CONSTASCII_USTRINGPARAM(
- CFGPROPERTY_NODEPATH ) );
+ = OUString( CFGPROPERTY_NODEPATH );
aProperty.Value
- <<= OUString( RTL_CONSTASCII_USTRINGPARAM(
- STORE_CONTENTPROPERTIES_KEY ) );
+ <<= OUString( STORE_CONTENTPROPERTIES_KEY );
aArguments[ 0 ] <<= aProperty;
m_pImpl->m_bTriedToGetRootReadAccess = sal_True;
m_pImpl->m_xRootReadAccess =
m_pImpl->m_xConfigProvider->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationAccess" )),
+ OUString( "com.sun.star.configuration.ConfigurationAccess" ),
aArguments );
if ( m_pImpl->m_xRootReadAccess.is() )
@@ -1154,17 +1147,11 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
Sequence< Any > aArguments( 2 );
PropertyValue aProperty;
- aProperty.Name
- = OUString( RTL_CONSTASCII_USTRINGPARAM(
- CFGPROPERTY_NODEPATH ) );
- aProperty.Value
- <<= OUString( RTL_CONSTASCII_USTRINGPARAM(
- STORE_CONTENTPROPERTIES_KEY ) );
+ aProperty.Name = OUString( CFGPROPERTY_NODEPATH );
+ aProperty.Value <<= OUString( STORE_CONTENTPROPERTIES_KEY );
aArguments[ 0 ] <<= aProperty;
- aProperty.Name
- = OUString( RTL_CONSTASCII_USTRINGPARAM(
- CFGPROPERTY_LAZYWRITE ) );
+ aProperty.Name = OUString( CFGPROPERTY_LAZYWRITE );
aProperty.Value <<= sal_True;
aArguments[ 1 ] <<= aProperty;
@@ -1172,8 +1159,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
m_pImpl->m_xRootWriteAccess =
m_pImpl->m_xConfigProvider->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationUpdateAccess" )),
+ OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ),
aArguments );
OSL_ENSURE( m_pImpl->m_xRootWriteAccess.is(),
@@ -1349,10 +1335,8 @@ XTYPEPROVIDER_IMPL_8( PersistentPropertySet,
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.PersistentPropertySet" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- PERS_PROPSET_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.PersistentPropertySet" ),
+ OUString( PERS_PROPSET_SERVICE_NAME ) );
//=========================================================================
//
@@ -1455,7 +1439,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( getFullKey() );
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropName += OUString("/");
aFullPropName += makeHierarchalNameSegment( aPropertyName );
// Does property exist?
@@ -1474,7 +1458,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
{
// Obtain old value
OUString aValueName = aFullPropName;
- aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ aValueName += OUString("/Value");
Any aOldValue
= xRootHierNameAccess->getByHierarchicalName(
aValueName );
@@ -1487,12 +1471,12 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
// Write value
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
+ OUString("Value"),
aValue );
// Write state ( Now it is a directly set value )
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
+ OUString("State"),
makeAny(
sal_Int32(
PropertyState_DIRECT_VALUE ) ) );
@@ -1505,7 +1489,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
{
// Obtain handle
aValueName = aFullPropName;
- aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+ aValueName += OUString("/Handle");
sal_Int32 nHandle = -1;
xRootHierNameAccess->getByHierarchicalName( aValueName )
>>= nHandle;
@@ -1561,9 +1545,9 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
if ( xNameAccess.is() )
{
OUString aFullPropName( getFullKey() );
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropName += OUString("/");
aFullPropName += makeHierarchalNameSegment( PropertyName );
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ aFullPropName += OUString("/Value");
try
{
return xNameAccess->getByHierarchicalName( aFullPropName );
@@ -1720,7 +1704,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
{
aFullValuesName = getFullKey();
OUString aFullPropName = aFullValuesName;
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropName += OUString("/");
aFullPropName += makeHierarchalNameSegment( Name );
if ( xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
@@ -1766,24 +1750,24 @@ void SAL_CALL PersistentPropertySet::addProperty(
// Set handle
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
+ OUString("Handle"),
makeAny( sal_Int32( -1 ) ) );
// Set default value
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
+ OUString("Value"),
DefaultValue );
// Set state ( always "default" )
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
+ OUString("State"),
makeAny(
sal_Int32(
PropertyState_DEFAULT_VALUE ) ) );
// Set attributes
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Attributes")),
+ OUString("Attributes"),
makeAny( sal_Int32( Attributes ) ) );
// Insert new item.
@@ -1871,7 +1855,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
{
aFullValuesName = getFullKey();
aFullPropName = aFullValuesName;
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropName += OUString("/");
aFullPropName += makeHierarchalNameSegment( Name );
// Property in set?
@@ -1882,7 +1866,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
try
{
OUString aFullAttrName = aFullPropName;
- aFullAttrName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
+ aFullAttrName += OUString("/Attributes");
sal_Int32 nAttribs = 0;
if ( xRootHierNameAccess->getByHierarchicalName( aFullAttrName )
@@ -1940,7 +1924,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
{
OUString aFullHandleName = aFullPropName;
aFullHandleName
- += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+ += OUString("/Handle");
if ( ! ( xRootHierNameAccess->getByHierarchicalName(
aFullHandleName ) >>= nHandle ) )
@@ -2070,9 +2054,9 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
{
Sequence< PropertyValue > aValues( nCount );
- const OUString aHandleName(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
- const OUString aValueName(RTL_CONSTASCII_USTRINGPARAM("/Value"));
- const OUString aStateName(RTL_CONSTASCII_USTRINGPARAM("/State"));
+ const OUString aHandleName("/Handle");
+ const OUString aValueName("/Value");
+ const OUString aStateName("/State");
for ( sal_Int32 n = 0; n < nCount; ++n )
{
@@ -2192,7 +2176,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
Events aEvents;
OUString aFullPropNamePrefix( getFullKey() );
- aFullPropNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropNamePrefix += OUString("/");
// Iterate over given property value sequence.
for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -2219,23 +2203,23 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
{
// Write handle
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
+ OUString("Handle"),
makeAny( rNewValue.Handle ) );
// Save old value
OUString aValueName = aFullPropName;
- aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ aValueName += OUString("/Value");
Any aOldValue
= xRootHierNameAccess->getByHierarchicalName(
aValueName );
// Write value
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
+ OUString("Value"),
rNewValue.Value );
// Write state ( Now it is a directly set value )
xNameReplace->replaceByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
+ OUString("State"),
makeAny(
sal_Int32(
PropertyState_DIRECT_VALUE ) ) );
@@ -2367,7 +2351,7 @@ const OUString& PersistentPropertySet::getFullKey()
m_pImpl->m_aFullKey
= makeHierarchalNameSegment( m_pImpl->m_aKey );
m_pImpl->m_aFullKey
- += OUString( RTL_CONSTASCII_USTRINGPARAM( "/Values" ) );
+ += OUString( "/Values" );
}
}
@@ -2471,9 +2455,9 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
if ( xHierNameAccess.is() )
{
- const OUString aHandleName(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
- const OUString aValueName(RTL_CONSTASCII_USTRINGPARAM("/Value"));
- const OUString aAttrName(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
+ const OUString aHandleName("/Handle");
+ const OUString aValueName("/Value");
+ const OUString aAttrName("/Attributes");
Property* pProps = pPropSeq->getArray();
@@ -2590,7 +2574,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( m_pOwner->getFullKey() );
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropName += OUString("/");
aFullPropName += makeHierarchalNameSegment( aName );
// Does property exist?
@@ -2603,7 +2587,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain handle.
OUString aKey = aFullPropName;
- aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+ aKey += OUString("/Handle");
if ( !( xRootHierNameAccess->getByHierarchicalName( aKey )
>>= aProp.Handle ) )
@@ -2615,7 +2599,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain Value and extract type.
aKey = aFullPropName;
- aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ aKey += OUString("/Value");
Any aValue = xRootHierNameAccess->getByHierarchicalName( aKey );
if ( !aValue.hasValue() )
@@ -2629,7 +2613,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain Attributes.
aKey = aFullPropName;
- aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
+ aKey += OUString("/Attributes");
sal_Int32 nAttribs = 0;
if ( xRootHierNameAccess->getByHierarchicalName( aKey )
@@ -2674,7 +2658,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( m_pOwner->getFullKey() );
- aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aFullPropName += OUString("/");
aFullPropName += makeHierarchalNameSegment( Name );
return xRootHierNameAccess->hasByHierarchicalName( aFullPropName );
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 1b6c57d..f208402 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -135,10 +135,8 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.SortedDynamicResultSet" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- DYNAMIC_RESULTSET_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" ),
+ OUString( DYNAMIC_RESULTSET_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// XComponent methods.
@@ -254,8 +252,7 @@ SortedDynamicResultSet::connectToCache(
{
xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
mxSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
+ OUString( "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
UNO_QUERY );
}
catch ( Exception const & )
@@ -340,7 +337,7 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
Any aRet;
try {
- aRet = pCurSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) );
+ aRet = pCurSet->getPropertyValue( OUString("IsRowCountFinal") );
}
catch (const UnknownPropertyException&) {}
catch (const WrappedTargetException&) {}
@@ -511,10 +508,8 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- DYNAMIC_RESULTSET_FACTORY_NAME )) );
+ OUString( "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ),
+ OUString( DYNAMIC_RESULTSET_FACTORY_NAME ) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 0640141..d75eaef 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -247,10 +247,8 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet,
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet,
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.ucb.SortedResultSet" )),
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- RESULTSET_SERVICE_NAME )) );
+ OUString( "com.sun.star.comp.ucb.SortedResultSet" ),
+ OUString( RESULTSET_SERVICE_NAME ) );
//--------------------------------------------------------------------------
// XComponent methods.
@@ -949,7 +947,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
if ( bOrgFinal )
{
aOrgRet = Reference< XPropertySet >::query(mxOriginal)->
- getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) );
+ getPropertyValue( OUString("RowCount") );
sal_uInt32 nOrgCount = 0;
aOrgRet >>= nOrgCount;
if ( nOrgCount == maS2O.Count() )
@@ -1496,7 +1494,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
sal_Bool bIsFinal = sal_False;
PropertyChangeEvent aEvt;
- aEvt.PropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
+ aEvt.PropertyName = OUString("RowCount");
aEvt.Further = sal_False;
aEvt.PropertyHandle = -1;
aEvt.OldValue <<= nOldCount;
@@ -1504,7 +1502,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
PropertyChanged( aEvt );
- OUString aName = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
+ OUString aName = OUString("IsRowCountFinal");
Any aRet = getPropertyValue( aName );
if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal )
{
@@ -2010,12 +2008,12 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos )
SRSPropertySetInfo::SRSPropertySetInfo()
{
- maProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
+ maProps[0].Name = OUString("RowCount");
maProps[0].Handle = -1;
maProps[0].Type = ::getCppuType( (const OUString*) NULL );
maProps[0].Attributes = -1;
- maProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
+ maProps[1].Name = OUString("IsRowCountFinal");
maProps[1].Handle = -1;
maProps[1].Type = ::getBooleanCppuType();
maProps[1].Attributes = -1;
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 1d05a21..69d60f4 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -192,15 +192,15 @@ namespace ucb { namespace ucp { namespace ext
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Content::getImplementationName() throw( RuntimeException )
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.ucp.ext.Content" ) );
+ return ::rtl::OUString( "org.openoffice.comp.ucp.ext.Content" );
}
//------------------------------------------------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException )
{
Sequence< ::rtl::OUString > aServiceNames(2);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.Content" ) );
- aServiceNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.ExtensionContent" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.Content" );
+ aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContent" );
return aServiceNames;
}
@@ -289,7 +289,7 @@ namespace ucb { namespace ucp { namespace ext
{
const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() );
::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEvironment );
- aRet = aRequestedContent.executeCommand( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), makeAny( aOpenCommand ) );
+ aRet = aRequestedContent.executeCommand( ::rtl::OUString( "open" ), makeAny( aOpenCommand ) );
}
}
@@ -449,22 +449,22 @@ namespace ucb { namespace ucp { namespace ext
else
{
// Append all Core Properties.
- xRow->appendString ( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
+ xRow->appendString ( Property( ::rtl::OUString("ContentType"),
-1,
getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
ContentProvider::getArtificialNodeContentType() );
- xRow->appendString ( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
+ xRow->appendString ( Property( ::rtl::OUString("Title"),
-1,
getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
i_rTitle );
- xRow->appendBoolean( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
+ xRow->appendBoolean( Property( ::rtl::OUString("IsDocument"),
-1,
getCppuBooleanType(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
sal_False );
- xRow->appendBoolean( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
+ xRow->appendBoolean( Property( ::rtl::OUString("IsFolder"),
-1,
getCppuBooleanType(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
@@ -555,7 +555,7 @@ namespace ucb { namespace ucp { namespace ext
for ( sal_Int32 n = 0; n < nCount; ++n, ++pValues )
{
// all our properties are read-only ...
- aRet[ n ] <<= IllegalAccessException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("property is read-only.")), *this );
+ aRet[ n ] <<= IllegalAccessException( ::rtl::OUString("property is read-only."), *this );
}
return aRet;
@@ -571,23 +571,23 @@ namespace ucb { namespace ucp { namespace ext
// Mandatory commands
///////////////////////////////////////////////////////////////
CommandInfo(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ),
+ ::rtl::OUString( "getCommandInfo" ),
-1,
getCppuVoidType()
),
CommandInfo(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ),
+ ::rtl::OUString( "getPropertySetInfo" ),
-1,
getCppuVoidType()
),
CommandInfo(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ),
+ ::rtl::OUString( "getPropertyValues" ),
-1,
getCppuType(
static_cast< Sequence< Property > * >( 0 ) )
),
CommandInfo(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ),
+ ::rtl::OUString( "setPropertyValues" ),
-1,
getCppuType(
static_cast< Sequence< PropertyValue > * >( 0 ) )
@@ -596,7 +596,7 @@ namespace ucb { namespace ucp { namespace ext
// Optional standard commands
///////////////////////////////////////////////////////////////
, CommandInfo(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ),
+ ::rtl::OUString( "open" ),
-1,
getCppuType( static_cast< OpenCommandArgument2 * >( 0 ) )
)
@@ -611,25 +611,25 @@ namespace ucb { namespace ucp { namespace ext
static Property aProperties[] =
{
Property(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) ),
+ ::rtl::OUString( "ContentType" ),
-1,
getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ) ),
+ ::rtl::OUString( "IsDocument" ),
-1,
getCppuBooleanType(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) ),
+ ::rtl::OUString( "IsFolder" ),
-1,
getCppuBooleanType(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
),
Property(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ),
+ ::rtl::OUString( "Title" ),
-1,
getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
PropertyAttribute::BOUND | PropertyAttribute::READONLY
@@ -648,7 +648,7 @@ namespace ucb { namespace ucp { namespace ext
try
{
Sequence< Property > aProps(1);
- aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) );
+ aProps[0].Name = ::rtl::OUString( "IsFolder" );
Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW );
bIsFolder = xRow->getBoolean(1);
}
@@ -672,7 +672,7 @@ namespace ucb { namespace ucp { namespace ext
try
{
Sequence< Property > aProps(1);
- aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ) );
+ aProps[0].Name = ::rtl::OUString( "ContentType" );
Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW );
m_aContentType.reset( xRow->getString(1) );
}
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 746f37b..8da1600 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -79,7 +79,7 @@ namespace ucb { namespace ucp { namespace ext
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.ucp.ext.ContentProvider" ) );
+ return ::rtl::OUString( "org.openoffice.comp.ucp.ext.ContentProvider" );
}
//------------------------------------------------------------------------------------------------------------------
@@ -92,8 +92,8 @@ namespace ucb { namespace ucp { namespace ext
Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aServiceNames(2);
- aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.ContentProvider" ) );
- aServiceNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.ExtensionContentProvider" ) );
+ aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.ContentProvider" );
+ aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContentProvider" );
return aServiceNames;
}
@@ -113,13 +113,13 @@ namespace ucb { namespace ucp { namespace ext
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString ContentProvider::getRootURL()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.extension://" ) );
+ return ::rtl::OUString( "vnd.sun.star.extension://" );
}
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString ContentProvider::getArtificialNodeContentType()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.extension-content" ) );
+ return ::rtl::OUString( "application/vnd.sun.star.extension-content" );
}
//------------------------------------------------------------------------------------------------------------------
@@ -139,7 +139,7 @@ namespace ucb { namespace ucp { namespace ext
throw( IllegalIdentifierException, RuntimeException )
{
// Check URL scheme...
- const ::rtl::OUString sScheme( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.extension") );
+ const ::rtl::OUString sScheme( "vnd.sun.star.extension" );
if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( sScheme ) )
throw IllegalIdentifierException();
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index ad48bd4..eba4595 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -265,7 +265,7 @@ rtl::OUString SAL_CALL
BaseContent::getImplementationName()
throw( RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ucb.FileContent"));
+ return rtl::OUString("com.sun.star.comp.ucb.FileContent");
}
@@ -287,7 +287,7 @@ BaseContent::getSupportedServiceNames()
throw( RuntimeException )
{
Sequence< rtl::OUString > ret( 1 );
- ret[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContent"));
+ ret[0] = rtl::OUString("com.sun.star.ucb.FileContent");
return ret;
}
@@ -419,7 +419,7 @@ BaseContent::execute( const Command& aCommand,
{
Sequence< beans::Property > seq(1);
seq[0] = beans::Property(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL")),
+ rtl::OUString("CasePreservingURL"),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -528,7 +528,7 @@ BaseContent::getContentType()
{
// Who am I ?
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
+ seq[0] = beans::Property( rtl::OUString("IsDocument"),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -605,7 +605,7 @@ BaseContent::addProperty(
{
if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() )
{
- throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
+ throw lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 );
}
m_pMyShell->associate( m_aUncPath,Name,DefaultValue,Attributes );
@@ -621,7 +621,7 @@ BaseContent::removeProperty(
{
if( m_nState & Deleted )
- throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+ throw beans::UnknownPropertyException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() );
m_pMyShell->deassociate( m_aUncPath, Name );
}
@@ -665,7 +665,7 @@ BaseContent::createNewContent(
try
{
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
+ seq[0] = beans::Property( rtl::OUString("IsDocument"),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -768,7 +768,7 @@ BaseContent::setParent(
throw( lang::NoSupportException,
RuntimeException)
{
- throw lang::NoSupportException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+ throw lang::NoSupportException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() );
}
@@ -866,7 +866,7 @@ BaseContent::setPropertyValues(
return Sequence< Any >( Values.getLength() );
}
- const rtl::OUString Title(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ const rtl::OUString Title("Title");
// Special handling for files which have to be inserted
if( m_nState & JustInserted )
@@ -920,7 +920,7 @@ BaseContent::setPropertyValues(
// m_aUncPath contains parent's URI.
if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
- m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ m_aUncPath += rtl::OUString("/");
m_aUncPath += rtl::Uri::encode( NewTitle,
rtl_UriCharClassPchar,
@@ -949,19 +949,19 @@ BaseContent::setPropertyValues(
rtl::OUString NewTitle;
if( !( Values[i].Value >>= NewTitle ) )
{
- ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+ ret[i] <<= beans::IllegalTypeException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() );
break;
}
else if( NewTitle.isEmpty() )
{
- ret[i] <<= lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
+ ret[i] <<= lang::IllegalArgumentException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >(), 0 );
break;
}
rtl::OUString aDstName = getParentName( m_aUncPath );
if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 )
- aDstName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ aDstName += rtl::OUString("/");
aDstName += rtl::Uri::encode( NewTitle,
rtl_UriCharClassPchar,
@@ -1123,7 +1123,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
// Is destination a document or a folder ?
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
+ seq[0] = beans::Property( rtl::OUString("IsDocument"),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -1146,7 +1146,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
// as child
dstUncPath = m_aUncPath;
- dstUncPath += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + NewTitle );
+ dstUncPath += ( rtl::OUString("/") + NewTitle );
sal_Int32 NameClash = aTransferInfo.NameClash;
@@ -1192,7 +1192,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
sal_Bool bDocument = false;
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
+ seq[0] = beans::Property( rtl::OUString("IsDocument"),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -1257,7 +1257,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
m_pMyShell->clearError( nMyCommandIdentifier );
m_aUncPath = getParentName( m_aUncPath );
if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
- m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ m_aUncPath += rtl::OUString("/");
m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(),
rtl_UriCharClassPchar,
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index bab84d6..ef9e65f 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -94,17 +94,13 @@ namespace {
switch (aStatus.getFileType())
{
case osl::FileStatus::Directory:
- aResourceType
- = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("folder"));
+ aResourceType = rtl::OUString( "folder");
bResourceType = true;
break;
case osl::FileStatus::Volume:
{
- aResourceType
- = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("volume"));
+ aResourceType = rtl::OUString( "volume");
bResourceType = true;
osl::VolumeInfo aVolumeInfo(
osl_VolumeInfo_Mask_Attributes );
@@ -134,29 +130,25 @@ namespace {
(bRemoveProperty ? 1 : 0) );
sal_Int32 i = 0;
aArguments[i++]
- <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Uri")),
+ <<= PropertyValue(rtl::OUString( "Uri"),
-1,
makeAny(rPhysicalUrl),
PropertyState_DIRECT_VALUE);
if (bResourceName)
aArguments[i++]
- <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ResourceName")),
+ <<= PropertyValue(rtl::OUString( "ResourceName"),
-1,
makeAny(aResourceName),
PropertyState_DIRECT_VALUE);
if (bResourceType)
aArguments[i++]
- <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ResourceType")),
+ <<= PropertyValue(rtl::OUString( "ResourceType"),
-1,
makeAny(aResourceType),
PropertyState_DIRECT_VALUE);
if (bRemoveProperty)
aArguments[i++]
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list