[Libreoffice-commits] .: ucb/source ucb/workben
David Tardon
dtardon at kemper.freedesktop.org
Sat Nov 13 00:01:08 PST 2010
ucb/source/cacher/cachedcontentresultset.cxx | 28 +-
ucb/source/cacher/cachedcontentresultsetstub.cxx | 20 -
ucb/source/cacher/cacheddynamicresultset.cxx | 16 -
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 20 -
ucb/source/cacher/cacheserv.cxx | 4
ucb/source/cacher/contentresultsetwrapper.cxx | 2
ucb/source/cacher/dynamicresultsetwrapper.cxx | 4
ucb/source/core/provprox.cxx | 16 -
ucb/source/core/ucb.cxx | 16 -
ucb/source/core/ucbcmds.cxx | 159 +++++++-------
ucb/source/core/ucbprops.cxx | 8
ucb/source/core/ucbserv.cxx | 4
ucb/source/core/ucbstore.cxx | 132 +++++-------
ucb/source/sorter/sortdynres.cxx | 22 +-
ucb/source/sorter/sortmain.cxx | 4
ucb/source/sorter/sortresult.cxx | 18 -
ucb/source/ucp/ext/ucpext_content.cxx | 10
ucb/source/ucp/ext/ucpext_provider.cxx | 2
ucb/source/ucp/file/bc.cxx | 24 +-
ucb/source/ucp/file/filglob.cxx | 10
ucb/source/ucp/file/filinsreq.cxx | 2
ucb/source/ucp/file/filrow.cxx | 2
ucb/source/ucp/file/filrset.cxx | 28 +-
ucb/source/ucp/file/filstr.cxx | 4
ucb/source/ucp/file/prov.cxx | 12 -
ucb/source/ucp/file/shell.cxx | 74 +++---
ucb/source/ucp/ftp/ftpcontent.cxx | 58 ++---
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 2
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 6
ucb/source/ucp/ftp/ftpresultsetI.cxx | 4
ucb/source/ucp/ftp/ftpresultsetbase.cxx | 20 -
ucb/source/ucp/ftp/ftpservices.cxx | 4
ucb/source/ucp/ftp/ftpurl.cxx | 18 -
ucb/source/ucp/ftp/test.cxx | 14 -
ucb/source/ucp/ftp/test_ftpurl.cxx | 12 -
ucb/source/ucp/gio/gio_content.cxx | 30 +-
ucb/source/ucp/gio/gio_datasupplier.cxx | 4
ucb/source/ucp/gio/gio_provider.cxx | 12 -
ucb/source/ucp/gvfs/gvfs_content.cxx | 38 +--
ucb/source/ucp/gvfs/gvfs_directory.cxx | 2
ucb/source/ucp/gvfs/gvfs_provider.cxx | 12 -
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 188 ++++++++---------
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 8
ucb/source/ucp/hierarchy/hierarchydata.cxx | 38 +--
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 12 -
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx | 6
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 8
ucb/source/ucp/hierarchy/hierarchyservices.cxx | 4
ucb/source/ucp/hierarchy/hierarchyuri.cxx | 14 -
ucb/source/ucp/odma/odma_content.cxx | 36 +--
ucb/source/ucp/odma/odma_provider.cxx | 4
ucb/source/ucp/odma/odma_services.cxx | 4
ucb/source/ucp/package/pkgcontent.cxx | 230 ++++++++++-----------
ucb/source/ucp/package/pkgdatasupplier.cxx | 4
ucb/source/ucp/package/pkgprovider.cxx | 12 -
ucb/source/ucp/package/pkgservices.cxx | 4
ucb/source/ucp/tdoc/tdoc_content.cxx | 202 +++++++++---------
ucb/source/ucp/tdoc/tdoc_content.hxx | 8
ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 2
ucb/source/ucp/tdoc/tdoc_services.cxx | 4
ucb/source/ucp/tdoc/tdoc_uri.cxx | 2
ucb/source/ucp/webdav/ContentProperties.cxx | 42 +--
ucb/source/ucp/webdav/DAVProperties.cxx | 45 +---
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 48 ++--
ucb/source/ucp/webdav/LinkSequence.cxx | 6
ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 2
ucb/source/ucp/webdav/NeonSession.cxx | 10
ucb/source/ucp/webdav/NeonUri.cxx | 8
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 38 +--
ucb/source/ucp/webdav/webdavcontent.cxx | 176 ++++++++--------
ucb/source/ucp/webdav/webdavdatasupplier.cxx | 4
ucb/source/ucp/webdav/webdavprovider.cxx | 22 +-
ucb/source/ucp/webdav/webdavservices.cxx | 4
ucb/workben/ucb/ucbdemo.cxx | 82 +++----
74 files changed, 1059 insertions(+), 1095 deletions(-)
New commits:
commit 5fc3c183416a930ea9723970c850ce7e4bf646c9
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Nov 13 09:00:53 2010 +0100
Easy Hacks : RTL_CONSTASCII_USTRINGPARAM in libs-core
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index f3512ef..12910f0 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -444,10 +444,10 @@ public:
throw( RuntimeException );
};
-OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( OUString::createFromAscii( "RowCount" ) );
-OUString CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( OUString::createFromAscii( "IsRowCountFinal" ) );
-OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( OUString::createFromAscii( "FetchSize" ) );
-OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( OUString::createFromAscii( "FetchDirection" ) );
+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") );
CCRS_PropertySetInfo::CCRS_PropertySetInfo(
Reference< XPropertySetInfo > xInfo )
@@ -972,10 +972,10 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedContentResultSet" ),
- OUString::createFromAscii(
- CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedContentResultSet" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_CONTENT_RESULTSET_SERVICE_NAME )) );
//--------------------------------------------------------------------------
// XPropertySet methods. ( inherited )
@@ -2151,8 +2151,8 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
m_bTriedToGetTypeConverter = sal_True;
m_xTypeConverter = Reference< XTypeConverter >(
m_xSMgr->createInstance(
- OUString::createFromAscii(
- "com.sun.star.script.Converter" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.script.Converter" )) ),
UNO_QUERY );
OSL_ENSURE( m_xTypeConverter.is(),
@@ -2201,10 +2201,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedContentResultSetFactory,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
- OUString::createFromAscii(
- CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedContentResultSetFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_CONTENT_RESULTSET_FACTORY_NAME )) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 5962578..8fa0236 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -51,8 +51,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::createFromAscii( "FetchSize" ) )
- , m_aPropertyNameForFetchDirection( OUString::createFromAscii( "FetchDirection" ) )
+ , m_aPropertyNameForFetchSize( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchSize")) )
+ , m_aPropertyNameForFetchDirection( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchDirection")) )
{
impl_init();
}
@@ -240,10 +240,10 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
- OUString::createFromAscii(
- CACHED_CRS_STUB_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedContentResultSetStub" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_CRS_STUB_SERVICE_NAME )) );
//-----------------------------------------------------------------
// XFetchProvider methods.
@@ -599,10 +599,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
- OUString::createFromAscii(
- CACHED_CRS_STUB_FACTORY_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_CRS_STUB_FACTORY_NAME )) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 3b69204..0384b48 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -121,10 +121,10 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
- OUString::createFromAscii(
- CACHED_DRS_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedDynamicResultSet" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_DRS_SERVICE_NAME )) );
//--------------------------------------------------------------------------
// own methds. ( inherited )
@@ -177,10 +177,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
- OUString::createFromAscii(
- CACHED_DRS_FACTORY_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_DRS_FACTORY_NAME )) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 3df1a6e..3976e30 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -123,10 +123,10 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
- OUString::createFromAscii(
- CACHED_DRS_STUB_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedDynamicResultSetStub" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_DRS_STUB_SERVICE_NAME )) );
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
@@ -167,10 +167,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
- OUString::createFromAscii(
- CACHED_DRS_STUB_FACTORY_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CACHED_DRS_STUB_FACTORY_NAME )) );
//--------------------------------------------------------------------------
// Service factory implementation.
@@ -217,8 +217,8 @@ void SAL_CALL CachedDynamicResultSetStubFactory
try
{
xSortFactory = Reference< XSortedDynamicResultSetFactory >(
- m_xSMgr->createInstance( OUString::createFromAscii(
- "com.sun.star.ucb.SortedDynamicResultSetFactory" ) ),
+ m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.ucb.SortedDynamicResultSetFactory" )) ),
UNO_QUERY );
}
catch ( Exception const & )
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index a6bf130..ea3c5ea 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -46,9 +46,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
const OUString & rImplementationName,
Sequence< OUString > const & rServiceNames )
{
- OUString aKeyName( OUString::createFromAscii( "/" ) );
+ OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
aKeyName += rImplementationName;
- aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
Reference< XRegistryKey > xKey;
try
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index de6dd55..ea307f5 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
}
aGuard.reacquire();
- rtl::OUString aName = OUString::createFromAscii( "ResultSetType" );
+ rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("ResultSetType"));
//find out, if we are ForwardOnly and cache the value:
impl_init_xPropertySetOrigin();
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index d611468..b1f3a4e 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -428,8 +428,8 @@ void SAL_CALL DynamicResultSetWrapper
{
xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
m_xSMgr->createInstance(
- OUString::createFromAscii(
- "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
UNO_QUERY );
}
catch ( Exception const & )
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index ab33f62..f9109a4 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -86,10 +86,10 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ),
- OUString::createFromAscii(
- PROVIDER_FACTORY_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROVIDER_FACTORY_SERVICE_NAME )) );
//=========================================================================
//
@@ -214,10 +214,10 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.UcbContentProviderProxy" ),
- OUString::createFromAscii(
- PROVIDER_PROXY_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbContentProviderProxy" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROVIDER_PROXY_SERVICE_NAME )) );
//=========================================================================
//
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 6e5897b..a993eda 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -351,10 +351,10 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
//=========================================================================
XSERVICEINFO_IMPL_1( UniversalContentBroker,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.UniversalContentBroker" ),
- OUString::createFromAscii(
- UCB_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UniversalContentBroker" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ UCB_SERVICE_NAME )) );
//=========================================================================
//
@@ -659,8 +659,8 @@ Any SAL_CALL UniversalContentBroker::execute(
{
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
- rtl::OUString::createFromAscii(
- "Wrong argument type!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Wrong argument type!" )),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
Environment );
@@ -844,8 +844,8 @@ bool UniversalContentBroker::getContentProviderData(
{
uno::Reference< lang::XMultiServiceFactory > xConfigProv(
m_xSMgr->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationProvider" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationProvider" )) ),
uno::UNO_QUERY_THROW );
rtl::OUStringBuffer aFullPath;
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 032f47b..49c9e62 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -249,12 +249,12 @@ CommandProcessorInfo::CommandProcessorInfo()
(*m_pInfo)[ 0 ]
= ucb::CommandInfo(
- rtl::OUString::createFromAscii( GETCOMMANDINFO_NAME ), // Name
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GETCOMMANDINFO_NAME )), // Name
GETCOMMANDINFO_HANDLE, // Handle
getCppuVoidType() ); // ArgType
(*m_pInfo)[ 1 ]
= ucb::CommandInfo(
- rtl::OUString::createFromAscii( GLOBALTRANSFER_NAME ), // Name
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GLOBALTRANSFER_NAME )), // Name
GLOBALTRANSFER_HANDLE, // Handle
getCppuType(
static_cast<
@@ -559,19 +559,19 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii( "Target is no XCommandProcessor!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Target is no XCommandProcessor!")),
rContext.xProcessor );
// Unreachable
}
uno::Sequence< beans::Property > aPropsToObtain( 1 );
aPropsToObtain[ 0 ].Name
- = rtl::OUString::createFromAscii( "CreatableContentsInfo" );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo"));
aPropsToObtain[ 0 ].Handle
= -1;
ucb::Command aGetPropsCommand(
- rtl::OUString::createFromAscii( "getPropertyValues" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
-1,
uno::makeAny( aPropsToObtain ) );
@@ -613,7 +613,7 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii( "Target is no XContentCreator!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Target is no XContentCreator!")),
rContext.xProcessor );
// Unreachable
}
@@ -634,7 +634,7 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii( "No types creatable!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No types creatable!")),
rContext.xProcessor );
// Unreachable
}
@@ -700,8 +700,8 @@ uno::Reference< ucb::XContent > createNew(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString::createFromAscii(
- "Unknown transfer operation!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unknown transfer operation!" )),
rContext.xProcessor,
-1 ) ),
rContext.xOrigEnv );
@@ -721,7 +721,7 @@ uno::Reference< ucb::XContent > createNew(
// First, try it using "CreatabeleContentsInfo" property and
// "createNewContent" command -> the "new" way.
ucb::Command aCreateNewCommand(
- rtl::OUString::createFromAscii( "createNewContent" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")),
-1,
uno::makeAny( aTypesInfo[ n ] ) );
@@ -750,8 +750,8 @@ uno::Reference< ucb::XContent > createNew(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "createNewContent failed!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "createNewContent failed!" )),
rContext.xProcessor );
// Unreachable
}
@@ -770,7 +770,7 @@ void transferProperties(
throw( uno::Exception )
{
ucb::Command aGetPropertySetInfoCommand(
- rtl::OUString::createFromAscii( "getPropertySetInfo" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo")),
-1,
uno::Any() );
@@ -791,8 +791,8 @@ void transferProperties(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Unable to get propertyset info from source object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to get propertyset info from source object!" )),
rContext.xProcessor );
// Unreachable
}
@@ -800,7 +800,7 @@ void transferProperties(
uno::Sequence< beans::Property > aAllProps = xInfo->getProperties();
ucb::Command aGetPropsCommand1(
- rtl::OUString::createFromAscii( "getPropertyValues" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
-1,
uno::makeAny( aAllProps ) );
@@ -821,8 +821,8 @@ void transferProperties(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Unable to get properties from source object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to get properties from source object!" )),
rContext.xProcessor );
// Unreachable
}
@@ -893,7 +893,7 @@ void transferProperties(
if ( !bHasTitle && ( rContext.aArg.NewTitle.getLength() > 0 ) )
{
aPropValues[ nWritePos ].Name
- = rtl::OUString::createFromAscii( "Title" );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
aPropValues[ nWritePos ].Handle = -1;
aPropValues[ nWritePos ].Value <<= rContext.aArg.NewTitle;
@@ -905,7 +905,7 @@ void transferProperties(
== ucb::TransferCommandOperation_LINK ) )
{
aPropValues[ nWritePos ].Name
- = rtl::OUString::createFromAscii( "TargetURL" );
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
aPropValues[ nWritePos ].Handle = -1;
aPropValues[ nWritePos ].Value <<= rContext.aArg.SourceURL;
@@ -917,7 +917,7 @@ void transferProperties(
// Set properties at new object.
ucb::Command aSetPropsCommand(
- rtl::OUString::createFromAscii( "setPropertyValues" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")),
-1,
uno::makeAny( aPropValues ) );
@@ -952,7 +952,7 @@ uno::Reference< io::XInputStream > getInputStream(
aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused
ucb::Command aOpenCommand(
- rtl::OUString::createFromAscii( "open" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
-1,
uno::makeAny( aArg ) );
@@ -980,7 +980,7 @@ uno::Reference< io::XInputStream > getInputStream(
{
uno::Reference< io::XOutputStream > xOutputStream(
rContext.xSMgr->createInstance(
- rtl::OUString::createFromAscii( "com.sun.star.io.Pipe" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")) ),
uno::UNO_QUERY );
if ( xOutputStream.is() )
@@ -992,7 +992,7 @@ uno::Reference< io::XInputStream > getInputStream(
aArg.Properties = uno::Sequence< beans::Property >( 0 );
ucb::Command aOpenCommand(
- rtl::OUString::createFromAscii( "open" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
-1,
uno::makeAny( aArg ) );
@@ -1025,11 +1025,11 @@ uno::Reference< sdbc::XResultSet > getResultSet(
uno::Sequence< beans::Property > aProps( 3 );
- aProps[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" );
+ aProps[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
aProps[ 0 ].Handle = -1; /* unknown */
- aProps[ 1 ].Name = rtl::OUString::createFromAscii( "IsDocument" );
+ aProps[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
aProps[ 1 ].Handle = -1; /* unknown */
- aProps[ 2 ].Name = rtl::OUString::createFromAscii( "TargetURL" );
+ aProps[ 2 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
aProps[ 2 ].Handle = -1; /* unknown */
ucb::OpenCommandArgument2 aArg;
@@ -1038,7 +1038,7 @@ uno::Reference< sdbc::XResultSet > getResultSet(
aArg.Sink = 0;
aArg.Properties = aProps;
- ucb::Command aOpenCommand( rtl::OUString::createFromAscii( "open" ),
+ ucb::Command aOpenCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
-1,
uno::makeAny( aArg ) );
try
@@ -1076,11 +1076,11 @@ void handleNameClashRename(
// Obtain old title.
uno::Sequence< beans::Property > aProps( 1 );
- aProps[ 0 ].Name = rtl::OUString::createFromAscii( "Title" );
+ aProps[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
aProps[ 0 ].Handle = -1;
ucb::Command aGetPropsCommand(
- rtl::OUString::createFromAscii( "getPropertyValues" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
-1,
uno::makeAny( aProps ) );
@@ -1101,8 +1101,8 @@ void handleNameClashRename(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >( &aProps2, 1 ),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Unable to get properties from new object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to get properties from new object!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1112,9 +1112,9 @@ void handleNameClashRename(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( beans::UnknownPropertyException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Unable to get property 'Title' "
- "from new object!" ),
+ "from new object!" )),
rContext.xProcessor ) ),
rContext.xOrigEnv );
// Unreachable
@@ -1133,7 +1133,7 @@ void handleNameClashRename(
aOldTitlePre = aOldTitle;
if ( nPos > 0 )
- aOldTitlePre += rtl::OUString::createFromAscii( "_" );
+ aOldTitlePre += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
sal_Bool bContinue = sal_True;
do
@@ -1194,8 +1194,8 @@ void handleNameClashRename(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >( &aProps2, 1 ),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Got no data stream from source!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Got no data stream from source!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1207,7 +1207,7 @@ void handleNameClashRename(
aArg.ReplaceExisting = sal_False;
ucb::Command aInsertCommand(
- rtl::OUString::createFromAscii( "insert" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
-1,
uno::makeAny( aArg ) );
@@ -1231,8 +1231,8 @@ void handleNameClashRename(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString::createFromAscii(
- "Unable to resolve name clash!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to resolve name clash!" )),
rContext.xProcessor,
ucb::NameClash::RENAME ) ),
rContext.xOrigEnv );
@@ -1254,9 +1254,9 @@ void globalTransfer_(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( beans::UnknownPropertyException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Unable to get property 'IsFolder' "
- "from source object!" ),
+ "from source object!" )),
rContext.xProcessor ) ),
rContext.xOrigEnv );
// Unreachable
@@ -1268,9 +1268,9 @@ void globalTransfer_(
{
ucbhelper::cancelCommandExecution(
uno::makeAny( beans::UnknownPropertyException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Unable to get property 'IsDocument' "
- "from source object!" ),
+ "from source object!" )),
rContext.xProcessor ) ),
rContext.xOrigEnv );
// Unreachable
@@ -1304,8 +1304,8 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_CREATE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "No matching content type at target!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "No matching content type at target!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1333,8 +1333,8 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_WRITE,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "New content is not a XCommandProcessor!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "New content is not a XCommandProcessor!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1356,8 +1356,8 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Source content is not a XCommandProcessor!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Source content is not a XCommandProcessor!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1426,7 +1426,7 @@ void globalTransfer_(
try
{
ucb::Command aInsertCommand(
- rtl::OUString::createFromAscii( "insert" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
-1,
uno::makeAny( aArg ) );
@@ -1444,9 +1444,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::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Unable to resolve name clashes, no chance to detect "
- "that there is one!" ),
+ "that there is one!" )),
rContext.xProcessor,
rContext.aArg.NameClash );
}
@@ -1472,9 +1472,9 @@ void globalTransfer_(
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedNameClashException(
- rtl::OUString::createFromAscii(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"BUG: insert + replace == true MUST NOT "
- "throw NameClashException." ),
+ "throw NameClashException." )),
rContext.xProcessor,
rContext.aArg.NameClash ) ),
rContext.xOrigEnv );
@@ -1617,8 +1617,8 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Unable to get properties from children of source!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to get properties from children of source!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1640,8 +1640,8 @@ void globalTransfer_(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
rContext.xOrigEnv,
- rtl::OUString::createFromAscii(
- "Unable to get children of source!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to get children of source!" )),
rContext.xProcessor );
// Unreachable
}
@@ -1697,14 +1697,13 @@ void globalTransfer_(
aAny =
xcp->execute(
ucb::Command(
- rtl::OUString::createFromAscii("getCommandInfo"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo")),
-1,
uno::Any()),
0,
rContext.xEnv );
- const rtl::OUString cmdName =
- rtl::OUString::createFromAscii("flush");
+ const rtl::OUString cmdName(RTL_CONSTASCII_USTRINGPARAM("flush"));
if((aAny >>= xci) && xci->hasCommandByName(cmdName))
xcp->execute(
ucb::Command(
@@ -1792,8 +1791,8 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Can't instanciate target object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Can't instanciate target object!" )),
this );
// Unreachable
}
@@ -1817,8 +1816,8 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Target content is not a XCommandProcessor!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Target content is not a XCommandProcessor!" )),
this );
// Unreachable
}
@@ -1838,7 +1837,7 @@ void UniversalContentBroker::globalTransfer(
try
{
ucb::Command aCommand(
- rtl::OUString::createFromAscii( "transfer" ), // Name
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), // Name
-1, // Handle
uno::makeAny( aTransferArg ) ); // Argument
@@ -1874,7 +1873,7 @@ void UniversalContentBroker::globalTransfer(
ucb::NameClash::ERROR );
ucb::Command aCommand1(
- rtl::OUString::createFromAscii( "transfer" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
-1,
uno::makeAny( aTransferArg1 ) );
@@ -1981,8 +1980,8 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Can't instanciate source object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Can't instanciate source object!" )),
this );
// Unreachable
}
@@ -2002,8 +2001,8 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Source content is not a XCommandProcessor!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Source content is not a XCommandProcessor!" )),
this );
// Unreachable
}
@@ -2012,17 +2011,17 @@ void UniversalContentBroker::globalTransfer(
uno::Sequence< beans::Property > aProps( 4 );
- aProps[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" );
+ aProps[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
aProps[ 0 ].Handle = -1; /* unknown */
- aProps[ 1 ].Name = rtl::OUString::createFromAscii( "IsDocument" );
+ aProps[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
aProps[ 1 ].Handle = -1; /* unknown */
- aProps[ 2 ].Name = rtl::OUString::createFromAscii( "TargetURL" );
+ aProps[ 2 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
aProps[ 2 ].Handle = -1; /* unknown */
- aProps[ 3 ].Name = rtl::OUString::createFromAscii( "BaseURI" );
+ aProps[ 3 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI"));
aProps[ 3 ].Handle = -1; /* unknown */
ucb::Command aGetPropsCommand(
- rtl::OUString::createFromAscii( "getPropertyValues" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
-1,
uno::makeAny( aProps ) );
@@ -2042,8 +2041,8 @@ void UniversalContentBroker::globalTransfer(
ucb::IOErrorCode_CANT_READ,
uno::Sequence< uno::Any >(&aProps2, 1),
xEnv,
- rtl::OUString::createFromAscii(
- "Unable to get properties from source object!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "Unable to get properties from source object!" )),
this );
// Unreachable
}
@@ -2076,7 +2075,7 @@ void UniversalContentBroker::globalTransfer(
try
{
ucb::Command aCommand(
- rtl::OUString::createFromAscii( "delete" ), // Name
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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 3bec7ed..a401106 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -358,10 +358,10 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbPropertiesManager,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.UcbPropertiesManager" ),
- OUString::createFromAscii(
- PROPERTIES_MANAGER_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbPropertiesManager" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROPERTIES_MANAGER_SERVICE_NAME )) );
//=========================================================================
//
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index e1f8ef5..f5a07e4 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -47,9 +47,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
const OUString & rImplementationName,
Sequence< OUString > const & rServiceNames )
{
- OUString aKeyName( OUString::createFromAscii( "/" ) );
+ OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
aKeyName += rImplementationName;
- aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< XRegistryKey > xKey;
try
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index ac727e1..a69b990 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -244,10 +244,10 @@ XTYPEPROVIDER_IMPL_4( UcbStore,
//=========================================================================
XSERVICEINFO_IMPL_1( UcbStore,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.UcbStore" ),
- OUString::createFromAscii(
- STORE_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.UcbStore" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ STORE_SERVICE_NAME )) );
//=========================================================================
//
@@ -383,10 +383,10 @@ XTYPEPROVIDER_IMPL_4( PropertySetRegistry,
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.PropertySetRegistry" ),
- OUString::createFromAscii(
- PROPSET_REG_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.PropertySetRegistry" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROPSET_REG_SERVICE_NAME )) );
//=========================================================================
//
@@ -461,7 +461,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
// // Set Values
// xNameReplace->replaceByName(
-// OUString::createFromAscii( "Values" ),
+// OUString(RTL_CONSTASCII_USTRINGPARAM("Values")),
// makeAny( ... ) );
// Insert new item.
@@ -845,7 +845,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
{
rtl::OUString aOldValuesKey
= makeHierarchalNameSegment( rOldKey );
- aOldValuesKey += OUString::createFromAscii( "/Values" );
+ aOldValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Values"));
Reference< XNameAccess > xOldNameAccess;
xRootHierNameAccess->getByHierarchicalName(
@@ -867,7 +867,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
{
rtl::OUString aNewValuesKey
= makeHierarchalNameSegment( rNewKey );
- aNewValuesKey += OUString::createFromAscii( "/Values" );
+ aNewValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Values"));
Reference< XSingleServiceFactory > xNewFac;
xRootHierNameAccess->getByHierarchicalName(
@@ -891,16 +891,12 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
return;
}
- aOldValuesKey += OUString::createFromAscii( "/" );
+ aOldValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- OUString aHandleKey
- = OUString::createFromAscii( "/Handle" );
- OUString aValueKey
- = OUString::createFromAscii( "/Value" );
- OUString aStateKey
- = OUString::createFromAscii( "/State" );
- OUString aAttrKey
- = OUString::createFromAscii( "/Attributes" );
+ OUString aHandleKey(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+ OUString aValueKey(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ OUString aStateKey(RTL_CONSTASCII_USTRINGPARAM("/State"));
+ OUString aAttrKey(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
for ( sal_Int32 n = 0; n < nCount; ++n )
{
@@ -931,7 +927,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString::createFromAscii( "Handle" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
aAny );
// ... value
@@ -941,7 +937,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString::createFromAscii( "Value" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
aAny );
// ... state
@@ -951,7 +947,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString::createFromAscii( "State" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
aAny );
// ... attributes
@@ -961,7 +957,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
xRootHierNameAccess->getByHierarchicalName(
aNewKey1 );
xNewPropNameReplace->replaceByName(
- OUString::createFromAscii( "Attributes" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Attributes")),
aAny );
// Insert new item.
@@ -1091,9 +1087,9 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider()
m_pImpl->m_xConfigProvider
= Reference< XMultiServiceFactory >(
m_xSMgr->createInstance(
- OUString::createFromAscii(
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration."
- "ConfigurationProvider" ) ),
+ "ConfigurationProvider" )) ),
UNO_QUERY );
OSL_ENSURE( m_pImpl->m_xConfigProvider.is(),
@@ -1149,8 +1145,8 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
m_pImpl->m_xRootReadAccess =
m_pImpl->m_xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationAccess" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationAccess" )),
aArguments );
if ( m_pImpl->m_xRootReadAccess.is() )
@@ -1221,8 +1217,8 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
m_pImpl->m_xRootWriteAccess =
m_pImpl->m_xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationUpdateAccess" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationUpdateAccess" )),
aArguments );
OSL_ENSURE( m_pImpl->m_xRootWriteAccess.is(),
@@ -1401,10 +1397,10 @@ XTYPEPROVIDER_IMPL_8( PersistentPropertySet,
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.PersistentPropertySet" ),
- OUString::createFromAscii(
- PERS_PROPSET_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.PersistentPropertySet" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PERS_PROPSET_SERVICE_NAME )) );
//=========================================================================
//
@@ -1507,7 +1503,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( getFullKey() );
- aFullPropName += OUString::createFromAscii( "/" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aFullPropName += makeHierarchalNameSegment( aPropertyName );
// Does property exist?
@@ -1526,7 +1522,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
{
// Obtain old value
OUString aValueName = aFullPropName;
- aValueName += OUString::createFromAscii( "/Value" );
+ aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
Any aOldValue
= xRootHierNameAccess->getByHierarchicalName(
aValueName );
@@ -1539,12 +1535,12 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
// Write value
xNameReplace->replaceByName(
- OUString::createFromAscii( "Value" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
aValue );
// Write state ( Now it is a directly set value )
xNameReplace->replaceByName(
- OUString::createFromAscii( "State" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
makeAny(
sal_Int32(
PropertyState_DIRECT_VALUE ) ) );
@@ -1557,7 +1553,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
{
// Obtain handle
aValueName = aFullPropName;
- aValueName += OUString::createFromAscii( "/Handle" );
+ aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
sal_Int32 nHandle = -1;
xRootHierNameAccess->getByHierarchicalName( aValueName )
>>= nHandle;
@@ -1613,9 +1609,9 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
if ( xNameAccess.is() )
{
OUString aFullPropName( getFullKey() );
- aFullPropName += OUString::createFromAscii( "/" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aFullPropName += makeHierarchalNameSegment( PropertyName );
- aFullPropName += OUString::createFromAscii( "/Value" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
try
{
return xNameAccess->getByHierarchicalName( aFullPropName );
@@ -1774,7 +1770,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
{
aFullValuesName = getFullKey();
OUString aFullPropName = aFullValuesName;
- aFullPropName += OUString::createFromAscii( "/" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aFullPropName += makeHierarchalNameSegment( Name );
if ( xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
@@ -1820,24 +1816,24 @@ void SAL_CALL PersistentPropertySet::addProperty(
// Set handle
xNameReplace->replaceByName(
- OUString::createFromAscii( "Handle" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
makeAny( sal_Int32( -1 ) ) );
// Set default value
xNameReplace->replaceByName(
- OUString::createFromAscii( "Value" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
DefaultValue );
// Set state ( always "default" )
xNameReplace->replaceByName(
- OUString::createFromAscii( "State" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
makeAny(
sal_Int32(
PropertyState_DEFAULT_VALUE ) ) );
// Set attributes
xNameReplace->replaceByName(
- OUString::createFromAscii( "Attributes" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Attributes")),
makeAny( sal_Int32( Attributes ) ) );
// Insert new item.
@@ -1930,7 +1926,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
{
aFullValuesName = getFullKey();
aFullPropName = aFullValuesName;
- aFullPropName += OUString::createFromAscii( "/" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aFullPropName += makeHierarchalNameSegment( Name );
// Property in set?
@@ -1941,7 +1937,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
try
{
OUString aFullAttrName = aFullPropName;
- aFullAttrName += OUString::createFromAscii( "/Attributes" );
+ aFullAttrName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
sal_Int32 nAttribs = 0;
if ( xRootHierNameAccess->getByHierarchicalName( aFullAttrName )
@@ -2001,7 +1997,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
{
OUString aFullHandleName = aFullPropName;
aFullHandleName
- += OUString::createFromAscii( "/Handle" );
+ += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
if ( ! ( xRootHierNameAccess->getByHierarchicalName(
aFullHandleName ) >>= nHandle ) )
@@ -2135,12 +2131,9 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
{
Sequence< PropertyValue > aValues( nCount );
- const OUString aHandleName
- = OUString::createFromAscii( "/Handle" );
- const OUString aValueName
- = OUString::createFromAscii( "/Value" );
- const OUString aStateName
- = OUString::createFromAscii( "/State" );
+ const OUString aHandleName(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+ const OUString aValueName(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ const OUString aStateName(RTL_CONSTASCII_USTRINGPARAM("/State"));
for ( sal_Int32 n = 0; n < nCount; ++n )
{
@@ -2265,7 +2258,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
Events aEvents;
OUString aFullPropNamePrefix( getFullKey() );
- aFullPropNamePrefix += OUString::createFromAscii( "/" );
+ aFullPropNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
// Iterate over given property value sequence.
for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -2292,23 +2285,23 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
{
// Write handle
xNameReplace->replaceByName(
- OUString::createFromAscii( "Handle" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
makeAny( rNewValue.Handle ) );
// Save old value
OUString aValueName = aFullPropName;
- aValueName += OUString::createFromAscii( "/Value" );
+ aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
Any aOldValue
= xRootHierNameAccess->getByHierarchicalName(
aValueName );
// Write value
xNameReplace->replaceByName(
- OUString::createFromAscii( "Value" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
rNewValue.Value );
// Write state ( Now it is a directly set value )
xNameReplace->replaceByName(
- OUString::createFromAscii( "State" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
makeAny(
sal_Int32(
PropertyState_DIRECT_VALUE ) ) );
@@ -2545,12 +2538,9 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
if ( xHierNameAccess.is() )
{
- const OUString aHandleName
- = OUString::createFromAscii( "/Handle" );
- const OUString aValueName
- = OUString::createFromAscii( "/Value" );
- const OUString aAttrName
- = OUString::createFromAscii( "/Attributes" );
+ const OUString aHandleName(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+ const OUString aValueName(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+ const OUString aAttrName(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
Property* pProps = pPropSeq->getArray();
@@ -2672,7 +2662,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( m_pOwner->getFullKey() );
- aFullPropName += OUString::createFromAscii( "/" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aFullPropName += makeHierarchalNameSegment( aName );
// Does property exist?
@@ -2685,7 +2675,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain handle.
OUString aKey = aFullPropName;
- aKey += OUString::createFromAscii( "/Handle" );
+ aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
if ( !( xRootHierNameAccess->getByHierarchicalName( aKey )
>>= aProp.Handle ) )
@@ -2698,7 +2688,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain Value and extract type.
aKey = aFullPropName;
- aKey += OUString::createFromAscii( "/Value" );
+ aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
Any aValue = xRootHierNameAccess->getByHierarchicalName( aKey );
if ( !aValue.hasValue() )
@@ -2713,7 +2703,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain Attributes.
aKey = aFullPropName;
- aKey += OUString::createFromAscii( "/Attributes" );
+ aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
sal_Int32 nAttribs = 0;
if ( xRootHierNameAccess->getByHierarchicalName( aKey )
@@ -2760,7 +2750,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( m_pOwner->getFullKey() );
- aFullPropName += OUString::createFromAscii( "/" );
+ aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aFullPropName += makeHierarchalNameSegment( Name );
return xRootHierNameAccess->hasByHierarchicalName( aFullPropName );
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index f58f45e..d3a666c 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -136,10 +136,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.SortedDynamicResultSet" ),
- OUString::createFromAscii(
- DYNAMIC_RESULTSET_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.SortedDynamicResultSet" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ DYNAMIC_RESULTSET_SERVICE_NAME )) );
//--------------------------------------------------------------------------
// XComponent methods.
@@ -255,8 +255,8 @@ SortedDynamicResultSet::connectToCache(
{
xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
mxSMgr->createInstance(
- OUString::createFromAscii(
- "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
UNO_QUERY );
}
catch ( Exception const & )
@@ -341,7 +341,7 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
Any aRet;
try {
- aRet = pCurSet->getPropertyValue( OUString::createFromAscii( "IsRowCountFinal" ) );
+ aRet = pCurSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) );
}
catch ( UnknownPropertyException ) {}
catch ( WrappedTargetException ) {}
@@ -512,10 +512,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
//--------------------------------------------------------------------------
XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ),
- OUString::createFromAscii(
- DYNAMIC_RESULTSET_FACTORY_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ DYNAMIC_RESULTSET_FACTORY_NAME )) );
//--------------------------------------------------------------------------
// Service factory implementation.
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index c7b2192..318b5e8 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -43,9 +43,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
const OUString & rImplementationName,
Sequence< OUString > const & rServiceNames )
{
- OUString aKeyName( OUString::createFromAscii( "/" ) );
+ OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
aKeyName += rImplementationName;
- aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< XRegistryKey > xKey;
try
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index d037424..44c87c3 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -248,10 +248,10 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet,
//--------------------------------------------------------------------------
XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet,
- OUString::createFromAscii(
- "com.sun.star.comp.ucb.SortedResultSet" ),
- OUString::createFromAscii(
- RESULTSET_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.comp.ucb.SortedResultSet" )),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ RESULTSET_SERVICE_NAME )) );
//--------------------------------------------------------------------------
// XComponent methods.
@@ -951,7 +951,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
if ( bOrgFinal )
{
aOrgRet = Reference< XPropertySet >::query(mxOriginal)->
- getPropertyValue( OUString::createFromAscii( "RowCount" ) );
+ getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) );
aOrgRet >>= nOrgCount;
if ( nOrgCount == maS2O.Count() )
aRet <<= (sal_Bool) sal_True;
@@ -1494,7 +1494,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
sal_Bool bIsFinal = sal_False;
PropertyChangeEvent aEvt;
- aEvt.PropertyName = OUString::createFromAscii( "RowCount" );
+ aEvt.PropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
aEvt.Further = sal_False;
aEvt.PropertyHandle = -1;
aEvt.OldValue <<= nOldCount;
@@ -1502,7 +1502,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
PropertyChanged( aEvt );
- OUString aName = OUString::createFromAscii( "IsRowCountFinal" );
+ OUString aName = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
Any aRet = getPropertyValue( aName );
if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal )
{
@@ -2003,12 +2003,12 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos )
SRSPropertySetInfo::SRSPropertySetInfo()
{
- maProps[0].Name = OUString::createFromAscii( "RowCount" );
+ maProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
maProps[0].Handle = -1;
maProps[0].Type = ::getCppuType( (const OUString*) NULL );
maProps[0].Attributes = -1;
- maProps[1].Name = OUString::createFromAscii( "IsRowCountFinal" );
+ maProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("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 be43b50..cd5f3e4 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -435,22 +435,22 @@ namespace ucb { namespace ucp { namespace ext
else
{
// Append all Core Properties.
- xRow->appendString ( Property( ::rtl::OUString::createFromAscii( "ContentType" ),
+ xRow->appendString ( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
-1,
getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
ContentProvider::getArtificialNodeContentType() );
- xRow->appendString ( Property( ::rtl::OUString::createFromAscii( "Title" ),
+ xRow->appendString ( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
-1,
getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
i_rTitle );
- xRow->appendBoolean( Property( ::rtl::OUString::createFromAscii( "IsDocument" ),
+ xRow->appendBoolean( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
-1,
getCppuBooleanType(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
sal_False );
- xRow->appendBoolean( Property( ::rtl::OUString::createFromAscii( "IsFolder" ),
+ xRow->appendBoolean( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
-1,
getCppuBooleanType(),
PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
@@ -541,7 +541,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::createFromAscii( "property is read-only." ), *this );
+ aRet[ n ] <<= IllegalAccessException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("property is read-only.")), *this );
}
return aRet;
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 7f0d020..b41f36e 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -140,7 +140,7 @@ namespace ucb { namespace ucp { namespace ext
throw( IllegalIdentifierException, RuntimeException )
{
// Check URL scheme...
- const ::rtl::OUString sScheme( rtl::OUString::createFromAscii( "vnd.sun.star.extension" ) );
+ const ::rtl::OUString sScheme( RTL_CONSTASCII_USTRINGPARAM("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 1da3318..a2c78df 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -267,7 +267,7 @@ rtl::OUString SAL_CALL
BaseContent::getImplementationName()
throw( RuntimeException)
{
- return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileContent" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ucb.FileContent"));
}
@@ -289,7 +289,7 @@ BaseContent::getSupportedServiceNames()
throw( RuntimeException )
{
Sequence< rtl::OUString > ret( 1 );
- ret[0] = rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContent" );
+ ret[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContent"));
return ret;
}
@@ -421,7 +421,7 @@ BaseContent::execute( const Command& aCommand,
{
Sequence< beans::Property > seq(1);
seq[0] = beans::Property(
- rtl::OUString::createFromAscii("CasePreservingURL"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL")),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -530,7 +530,7 @@ BaseContent::getContentType()
{
// Who am I ?
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+ seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -669,7 +669,7 @@ BaseContent::createNewContent(
try
{
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+ seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -872,7 +872,7 @@ BaseContent::setPropertyValues(
return Sequence< Any >( Values.getLength() );
}
- const rtl::OUString Title = rtl::OUString::createFromAscii( "Title" );
+ const rtl::OUString Title(RTL_CONSTASCII_USTRINGPARAM("Title"));
// Special handling for files which have to be inserted
if( m_nState & JustInserted )
@@ -926,7 +926,7 @@ BaseContent::setPropertyValues(
// m_aUncPath contains parent's URI.
if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
- m_aUncPath += rtl::OUString::createFromAscii("/");
+ m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
m_aUncPath += rtl::Uri::encode( NewTitle,
rtl_UriCharClassPchar,
@@ -967,7 +967,7 @@ BaseContent::setPropertyValues(
rtl::OUString aDstName = getParentName( m_aUncPath );
if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 )
- aDstName += rtl::OUString::createFromAscii("/");
+ aDstName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aDstName += rtl::Uri::encode( NewTitle,
rtl_UriCharClassPchar,
@@ -1129,7 +1129,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
// Is destination a document or a folder ?
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+ seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -1152,7 +1152,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
// as child
dstUncPath = m_aUncPath;
- dstUncPath += ( rtl::OUString::createFromAscii( "/" ) + NewTitle );
+ dstUncPath += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + NewTitle );
sal_Int32 NameClash = aTransferInfo.NameClash;
@@ -1198,7 +1198,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
sal_Bool bDocument = false;
Sequence< beans::Property > seq(1);
- seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+ seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
-1,
getCppuType( static_cast< sal_Bool* >(0) ),
0 );
@@ -1264,7 +1264,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::createFromAscii("/");
+ m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
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 8fd4e1e..6bcea45 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -222,10 +222,10 @@ namespace fileaccess {
rtl::OUString aParent = aFileName.copy( 0,lastIndex );
if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
- aParent += rtl::OUString::createFromAscii( "/" );
+ aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
if( 0 == aParent.compareToAscii( "file://" ) )
- aParent = rtl::OUString::createFromAscii( "file:///" );
+ aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
return aParent;
}
@@ -536,8 +536,8 @@ namespace fileaccess {
Sequence< ::rtl::OUString > aSeq( 1 );
aSeq[0] =
( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ) ?
- rtl::OUString::createFromAscii( "Title" ) :
- rtl::OUString::createFromAscii( "ContentType" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) :
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
aAny <<= MissingPropertiesException(
rtl::OUString(
@@ -603,7 +603,7 @@ namespace fileaccess {
InteractiveAugmentedIOException excep;
excep.Code = IOErrorCode_INVALID_CHARACTER;
PropertyValue prop;
- prop.Name = rtl::OUString::createFromAscii("ResourceName");
+ prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
prop.Handle = -1;
rtl::OUString m_aClashingName(
rtl::Uri::decode(
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 320d90e..6597713 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -207,7 +207,7 @@ XInteractionRequestImpl::getRequest()
InteractiveAugmentedIOException excep;
excep.Code = IOErrorCode_INVALID_CHARACTER;
PropertyValue prop;
- prop.Name = rtl::OUString::createFromAscii("ResourceName");
+ prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
prop.Handle = -1;
prop.Value <<= m_aClashingName;
Sequence<Any> seq(1);
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index 8c8c560..70314ca 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -56,7 +56,7 @@ sal_Bool convert( shell* pShell,
{
xConverter = uno::Reference< script::XTypeConverter >(
pShell->m_xMultiServiceFactory->createInstance(
- rtl::OUString::createFromAscii( "com.sun.star.script.Converter" ) ),uno::UNO_QUERY );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), uno::UNO_QUERY );
/* DBG_ASSERT( m_xTypeConverter.is(),
"PropertyValueSet::getTypeConverter() - "
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 13a8139..84a94bb 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -237,7 +237,7 @@ void XResultSet_impl::rowCountChanged()
aOldValue = aNewValue-1;
}
beans::PropertyChangeEvent aEv;
- aEv.PropertyName = rtl::OUString::createFromAscii( "RowCount" );
+ aEv.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
aEv.Further = false;
aEv.PropertyHandle = -1;
aEv.OldValue <<= aOldValue;
@@ -262,7 +262,7 @@ void XResultSet_impl::isFinalChanged()
m_bRowCountFinal = true;
}
beans::PropertyChangeEvent aEv;
- aEv.PropertyName = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+ aEv.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
aEv.Further = false;
aEv.PropertyHandle = -1;
sal_Bool fval = false;
@@ -734,8 +734,8 @@ XResultSet_impl::connectToCache(
xStubFactory
= uno::Reference< ucb::XCachedDynamicResultSetStubFactory >(
mxSMgr->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
uno::UNO_QUERY );
}
catch ( uno::Exception const & )
@@ -806,12 +806,12 @@ XResultSet_impl::getPropertySetInfo()
{
uno::Sequence< beans::Property > seq(2);
- seq[0].Name = rtl::OUString::createFromAscii( "RowCount" );
+ seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
seq[0].Handle = -1;
seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
seq[0].Attributes = beans::PropertyAttribute::READONLY;
- seq[0].Name = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+ seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
seq[0].Handle = -1;
seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) );
seq[0].Attributes = beans::PropertyAttribute::READONLY;
@@ -831,8 +831,8 @@ void SAL_CALL XResultSet_impl::setPropertyValue(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) ||
- aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+ if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ||
+ aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
return;
throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
@@ -844,13 +844,13 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( PropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+ if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
{
uno::Any aAny;
aAny <<= m_bRowCountFinal;
return aAny;
}
- else if ( PropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+ else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
{
uno::Any aAny;
sal_Int32 count = sal::static_int_cast<sal_Int32>(m_aItems.size());
@@ -869,7 +869,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+ if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
{
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners )
@@ -878,7 +878,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
m_pIsFinalListeners->addInterface( xListener );
}
- else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+ else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
{
osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners )
@@ -898,13 +898,13 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener(
lang::WrappedTargetException,
uno::RuntimeException)
{
- if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) &&
+ if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) &&
m_pIsFinalListeners )
{
osl::MutexGuard aGuard( m_aMutex );
m_pIsFinalListeners->removeInterface( aListener );
}
- else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) &&
+ else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) &&
m_pRowCountListeners )
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index d45ac34..640ec62 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -303,8 +303,8 @@ XStream_impl::closeStream(
if( err != osl::FileBase::E_None ) {
io::IOException ex;
- ex.Message = rtl::OUString::createFromAscii(
- "could not close file");
+ ex.Message = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "could not close file"));
throw ex;
}
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 3ca432a..4f9d19b 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -56,9 +56,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
const rtl::OUString & rImplementationName,
Sequence< rtl::OUString > const & rServiceNames )
{
- rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+ rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
aKeyName += rImplementationName;
- aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< registry::XRegistryKey > xKey;
try
@@ -263,7 +263,7 @@ FileProvider::supportsService(
const rtl::OUString& ServiceName )
throw( RuntimeException )
{
- return ServiceName == rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" );
+ return ServiceName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider"));
}
@@ -468,17 +468,17 @@ private:
XPropertySetInfoImpl2::XPropertySetInfoImpl2()
: m_seq( 3 )
{
- m_seq[0] = Property( rtl::OUString::createFromAscii( "HostName" ),
+ m_seq[0] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName")),
-1,
getCppuType( static_cast< rtl::OUString* >( 0 ) ),
PropertyAttribute::READONLY );
- m_seq[1] = Property( rtl::OUString::createFromAscii( "HomeDirectory" ),
+ m_seq[1] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeDirectory")),
-1,
getCppuType( static_cast< rtl::OUString* >( 0 ) ),
PropertyAttribute::READONLY );
- m_seq[2] = Property( rtl::OUString::createFromAscii( "FileSystemNotation" ),
+ m_seq[2] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileSystemNotation")),
-1,
getCppuType( static_cast< sal_Int32* >( 0 ) ),
PropertyAttribute::READONLY );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index c4e27aa..714588a 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -167,24 +167,24 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
m_bWithConfig( bWithConfig ),
m_pProvider( pProvider ),
m_xMultiServiceFactory( xMultiServiceFactory ),
- Title( rtl::OUString::createFromAscii( "Title" ) ),
+ Title( RTL_CONSTASCII_USTRINGPARAM("Title") ),
CasePreservingURL(
- rtl::OUString::createFromAscii( "CasePreservingURL" ) ),
- IsDocument( rtl::OUString::createFromAscii( "IsDocument" ) ),
- IsFolder( rtl::OUString::createFromAscii( "IsFolder" ) ),
- DateModified( rtl::OUString::createFromAscii( "DateModified" ) ),
- Size( rtl::OUString::createFromAscii( "Size" ) ),
- IsVolume( rtl::OUString::createFromAscii( "IsVolume" ) ),
- IsRemoveable( rtl::OUString::createFromAscii( "IsRemoveable" ) ),
- IsRemote( rtl::OUString::createFromAscii( "IsRemote" ) ),
- IsCompactDisc( rtl::OUString::createFromAscii( "IsCompactDisc" ) ),
- IsFloppy( rtl::OUString::createFromAscii( "IsFloppy" ) ),
- IsHidden( rtl::OUString::createFromAscii( "IsHidden" ) ),
- ContentType( rtl::OUString::createFromAscii( "ContentType" ) ),
- IsReadOnly( rtl::OUString::createFromAscii( "IsReadOnly" ) ),
- CreatableContentsInfo( rtl::OUString::createFromAscii( "CreatableContentsInfo" ) ),
- FolderContentType( rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ) ),
- FileContentType( rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-file" ) ),
+ RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL") ),
+ IsDocument( RTL_CONSTASCII_USTRINGPARAM("IsDocument") ),
+ IsFolder( RTL_CONSTASCII_USTRINGPARAM("IsFolder") ),
+ DateModified( RTL_CONSTASCII_USTRINGPARAM("DateModified") ),
+ Size( RTL_CONSTASCII_USTRINGPARAM("Size") ),
+ IsVolume( RTL_CONSTASCII_USTRINGPARAM("IsVolume") ),
+ IsRemoveable( RTL_CONSTASCII_USTRINGPARAM("IsRemoveable") ),
+ IsRemote( RTL_CONSTASCII_USTRINGPARAM("IsRemote") ),
+ IsCompactDisc( RTL_CONSTASCII_USTRINGPARAM("IsCompactDisc") ),
+ IsFloppy( RTL_CONSTASCII_USTRINGPARAM("IsFloppy") ),
+ IsHidden( RTL_CONSTASCII_USTRINGPARAM("IsHidden") ),
+ ContentType( RTL_CONSTASCII_USTRINGPARAM("ContentType") ),
+ IsReadOnly( RTL_CONSTASCII_USTRINGPARAM("IsReadOnly") ),
+ CreatableContentsInfo( RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo") ),
+ FolderContentType( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder") ),
+ FileContentType( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-file") ),
m_sCommandInfo( 9 )
{
// Title
@@ -364,45 +364,45 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
| beans::PropertyAttribute::READONLY ) );
// Commands
- m_sCommandInfo[0].Name = rtl::OUString::createFromAscii( "getCommandInfo" );
+ m_sCommandInfo[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo"));
m_sCommandInfo[0].Handle = -1;
m_sCommandInfo[0].ArgType = getCppuVoidType();
- m_sCommandInfo[1].Name = rtl::OUString::createFromAscii( "getPropertySetInfo" );
+ m_sCommandInfo[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo"));
m_sCommandInfo[1].Handle = -1;
m_sCommandInfo[1].ArgType = getCppuVoidType();
- m_sCommandInfo[2].Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+ m_sCommandInfo[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
m_sCommandInfo[2].Handle = -1;
m_sCommandInfo[2].ArgType = getCppuType( static_cast< uno::Sequence< beans::Property >* >( 0 ) );
- m_sCommandInfo[3].Name = rtl::OUString::createFromAscii( "setPropertyValues" );
+ m_sCommandInfo[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
m_sCommandInfo[3].Handle = -1;
m_sCommandInfo[3].ArgType = getCppuType( static_cast< uno::Sequence< beans::PropertyValue >* >( 0 ) );
- m_sCommandInfo[4].Name = rtl::OUString::createFromAscii( "open" );
+ m_sCommandInfo[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
m_sCommandInfo[4].Handle = -1;
m_sCommandInfo[4].ArgType = getCppuType( static_cast< OpenCommandArgument* >( 0 ) );
- m_sCommandInfo[5].Name = rtl::OUString::createFromAscii( "transfer" );
+ m_sCommandInfo[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer"));
m_sCommandInfo[5].Handle = -1;
m_sCommandInfo[5].ArgType = getCppuType( static_cast< TransferInfo* >( 0 ) );
- m_sCommandInfo[6].Name = rtl::OUString::createFromAscii( "delete" );
+ m_sCommandInfo[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete"));
m_sCommandInfo[6].Handle = -1;
m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) );
- m_sCommandInfo[7].Name = rtl::OUString::createFromAscii( "insert" );
+ m_sCommandInfo[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert"));
m_sCommandInfo[7].Handle = -1;
m_sCommandInfo[7].ArgType = getCppuType( static_cast< InsertCommandArgument* > ( 0 ) );
- m_sCommandInfo[7].Name = rtl::OUString::createFromAscii( "createNewContent" );
+ m_sCommandInfo[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent"));
m_sCommandInfo[7].Handle = -1;
m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) );
if(m_bWithConfig)
{
- rtl::OUString Store = rtl::OUString::createFromAscii( "com.sun.star.ucb.Store" );
+ rtl::OUString Store(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Store"));
uno::Reference< XPropertySetRegistryFactory > xRegFac(
m_xMultiServiceFactory->createInstance( Store ),
uno::UNO_QUERY );
@@ -914,7 +914,7 @@ shell::setv( const rtl::OUString& aUnqPath,
--propChanged; // unsuccessful setting
uno::Sequence< uno::Any > names( 1 );
ret[0] <<= beans::PropertyValue(
- rtl::OUString::createFromAscii("Uri"), -1,
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
uno::makeAny(aUnqPath),
beans::PropertyState_DIRECT_VALUE);
IOErrorCode ioError(IOErrorCode_GENERAL);
@@ -978,7 +978,7 @@ shell::setv( const rtl::OUString& aUnqPath,
--propChanged; // unsuccessful setting
uno::Sequence< uno::Any > names( 1 );
names[0] <<= beans::PropertyValue(
- rtl::OUString::createFromAscii("Uri"), -1,
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
uno::makeAny(aUnqPath),
beans::PropertyState_DIRECT_VALUE);
IOErrorCode ioError;
@@ -1208,7 +1208,7 @@ shell::move( sal_Int32 CommandId,
{
newDstUnqPath = dstUnqPath;
- rtl::OUString aPostFix( rtl::OUString::createFromAscii( "_" ) );
+ rtl::OUString aPostFix( RTL_CONSTASCII_USTRINGPARAM("_") );
aPostFix += rtl::OUString::valueOf( ++nTry );
newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1438,7 +1438,7 @@ shell::copy(
{
newDstUnqPath = dstUnqPath;
- rtl::OUString aPostFix( rtl::OUString::createFromAscii( "_" ) );
+ rtl::OUString aPostFix( RTL_CONSTASCII_USTRINGPARAM("_") );
aPostFix += rtl::OUString::valueOf( ++nTry );
newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1981,7 +1981,7 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString&
0 == Url.compareToAscii( "file://localhost/" ) ||
0 == Url.compareToAscii( "file://127.0.0.1/" ) )
{
- Unq = rtl::OUString::createFromAscii( "file:///" );
+ Unq = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
return false;
}
@@ -2062,7 +2062,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath,
RTL_TEXTENCODING_UTF8 );
if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 )
- newDstUnqPath += rtl::OUString::createFromAscii( "/" );
+ newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
newDstUnqPath += tit;
@@ -3033,7 +3033,7 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
uno::Sequence< beans::Property > props( 1 );
props[0] = beans::Property(
- rtl::OUString::createFromAscii( "Title" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
-1,
getCppuType( static_cast< rtl::OUString* >( 0 ) ),
beans::PropertyAttribute::MAYBEVOID
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list