Skip to content

C
core
Kaydet (Commit) 69660f21 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

targeted string re-work 

Change-Id: I20062aa0d39c0675014f1d38f10d6ab5c331ec75
üst 86013acb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 72 deletions
svl/source/config/itemholder2.cxx
Dosyayı görüntüle @ 69660f21
......@@ -57,7 +57,7 @@ ItemHolder2::ItemHolder2()
{
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
css::uno::Reference< css::lang::XComponent > xCfg(
xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
xSMGR->createInstance(::rtl::OUString("com.sun.star.configuration.ConfigurationProvider")),
css::uno::UNO_QUERY);
if (xCfg.is())
xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
......
svl/source/fsstor/fsfactory.cxx
Dosyayı görüntüle @ 69660f21
......@@ -50,15 +50,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.FileSystemStorageFactory"));
aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.FileSystemStorageFactory"));
aRet[0] = ::rtl::OUString("com.sun.star.embed.FileSystemStorageFactory");
aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.FileSystemStorageFactory");
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName()
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.FileSystemStorageFactory"));
return ::rtl::OUString("com.sun.star.comp.embed.FileSystemStorageFactory");
}
//-------------------------------------------------------------------------
......
svl/source/fsstor/fsstorage.cxx
Dosyayı görüntüle @ 69660f21
......@@ -253,8 +253,8 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
// create cursor for access to children
uno::Sequence< ::rtl::OUString > aProps( 2 );
::rtl::OUString* pProps = aProps.getArray();
pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
pProps[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
pProps[0] = ::rtl::OUString("TargetURL");
pProps[1] = ::rtl::OUString("IsFolder");
::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
try
......@@ -438,7 +438,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >&
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......@@ -483,7 +483,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
{
uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess(
m_pImpl->m_xFactory->createInstance(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ),
::rtl::OUString( "com.sun.star.ucb.SimpleFileAccess" ) ),
uno::UNO_QUERY_THROW );
xResult = xSimpleFileAccess->openFileReadWrite( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) );
}
......@@ -548,7 +548,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......@@ -656,7 +656,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......@@ -693,7 +693,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt
uno::Reference< io::XInputStream > xInStream = aResultContent.openStream();
xTempResult = uno::Reference < io::XStream >(
m_pImpl->m_xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
m_pImpl->m_xFactory->createInstance ( ::rtl::OUString("com.sun.star.io.TempFile") ),
uno::UNO_QUERY_THROW );
uno::Reference < io::XOutputStream > xTempOut = xTempResult->getOutputStream();
uno::Reference < io::XInputStream > xTempIn = xTempResult->getInputStream();
......@@ -731,7 +731,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......@@ -929,7 +929,7 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......@@ -1014,7 +1014,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName,
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......@@ -1094,7 +1094,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName )
catch ( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open element!\n")),
throw lang::WrappedTargetException( ::rtl::OUString("Can not open element!\n"),
uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ),
uno::UNO_QUERY ),
aCaught );
......@@ -1118,7 +1118,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames()
uno::Sequence< ::rtl::OUString > aProps( 1 );
::rtl::OUString* pProps = aProps.getArray();
pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
pProps[0] = ::rtl::OUString("Title");
::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
uno::Sequence< ::rtl::OUString > aResult;
......@@ -1147,7 +1147,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames()
else
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")),
throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"),
uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ),
uno::UNO_QUERY ),
aCaught );
......@@ -1160,7 +1160,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames()
catch ( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")),
throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"),
uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ),
uno::UNO_QUERY ),
aCaught );
......@@ -1194,7 +1194,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName )
catch ( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")),
throw lang::WrappedTargetRuntimeException( ::rtl::OUString("Can not open storage!\n"),
uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ),
uno::UNO_QUERY ),
aCaught );
......@@ -1233,7 +1233,7 @@ sal_Bool SAL_CALL FSStorage::hasElements()
throw io::IOException(); // TODO: error handling
uno::Sequence< ::rtl::OUString > aProps( 1 );
aProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
aProps[0] = ::rtl::OUString("TargetURL");
::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
try
......@@ -1474,7 +1474,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
{
uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess(
m_pImpl->m_xFactory->createInstance(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ),
::rtl::OUString( "com.sun.star.ucb.SimpleFileAccess" ) ),
uno::UNO_QUERY_THROW );
uno::Reference< io::XStream > xStream =
xSimpleFileAccess->openFileReadWrite( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) );
......@@ -1546,7 +1546,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
catch( uno::Exception& )
{
uno::Any aCaught( ::cppu::getCaughtException() );
throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
throw embed::StorageWrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
uno::Reference< io::XInputStream >(),
aCaught );
}
......
svl/source/items/globalnameitem.cxx
Dosyayı görüntüle @ 69660f21
......@@ -82,7 +82,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
{
com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter
( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.script.Converter")),
com::sun::star::uno::UNO_QUERY );
com::sun::star::uno::Sequence< sal_Int8 > aSeq;
com::sun::star::uno::Any aNew;
......
svl/source/items/ilstitem.cxx
Dosyayı görüntüle @ 69660f21
......@@ -82,7 +82,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const
bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 )
{
::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter
( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.script.Converter")),
::com::sun::star::uno::UNO_QUERY );
::com::sun::star::uno::Any aNew;
try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); }
......
svl/source/misc/documentlockfile.cxx
Dosyayı görüntüle @ 69660f21
......@@ -62,7 +62,7 @@ sal_Bool DocumentLockFile::m_bAllowInteraction = sal_True;
// ----------------------------------------------------------------------
DocumentLockFile::DocumentLockFile( const ::rtl::OUString& aOrigURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".~lock." ) ) )
: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( ".~lock." ) )
{
}
......@@ -100,7 +100,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
try
{
uno::Reference< io::XStream > xTempFile(
m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
m_xFactory->createInstance( ::rtl::OUString("com.sun.star.io.TempFile") ),
uno::UNO_QUERY_THROW );
uno::Reference< io::XSeekable > xSeekable( xTempFile, uno::UNO_QUERY_THROW );
......@@ -124,11 +124,11 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
aInsertArg.ReplaceExisting = sal_False;
uno::Any aCmdArg;
aCmdArg <<= aInsertArg;
aTargetContent.executeCommand( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), aCmdArg );
aTargetContent.executeCommand( ::rtl::OUString( "insert" ), aCmdArg );
// try to let the file be hidden if possible
try {
aTargetContent.setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ), uno::makeAny( sal_True ) );
aTargetContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) );
} catch( uno::Exception& ) {}
}
catch( ucb::NameClashException& )
......@@ -221,7 +221,7 @@ void DocumentLockFile::RemoveFile()
uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aCnt(m_aURL, xEnv);
aCnt.executeCommand(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
aCnt.executeCommand(rtl::OUString("delete"),
uno::makeAny(sal_Bool(sal_True)));
}
......
svl/source/misc/fstathelper.cxx
Dosyayı görüntüle @ 69660f21
......@@ -47,7 +47,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL,
::ucbhelper::Content aTestContent( rURL,
uno::Reference< XCommandEnvironment > ());
uno::Any aAny = aTestContent.getPropertyValue(
OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) );
OUString("DateModified") );
if( aAny.hasValue() )
{
bRet = sal_True;
......
svl/source/misc/sharecontrolfile.cxx
Dosyayı görüntüle @ 69660f21
......@@ -62,7 +62,7 @@ namespace svt {
// ----------------------------------------------------------------------
ShareControlFile::ShareControlFile( const ::rtl::OUString& aOrigURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".~sharing." ) ) )
: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( ".~sharing." ) )
{
OpenStream();
......@@ -115,11 +115,11 @@ void ShareControlFile::OpenStream()
ucb::InsertCommandArgument aInsertArg;
aInsertArg.Data = xInput;
aInsertArg.ReplaceExisting = sal_False;
aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), uno::makeAny( aInsertArg ) );
aContent.executeCommand( rtl::OUString("insert"), uno::makeAny( aInsertArg ) );
// try to let the file be hidden if possible
try {
aContent.setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ), uno::makeAny( sal_True ) );
aContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) );
} catch( uno::Exception& ) {}
// Try to open one more time
......@@ -362,7 +362,7 @@ void ShareControlFile::RemoveFile()
uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
xFactory->createInstance( ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess") ),
uno::UNO_QUERY_THROW );
xSimpleFileAccess->kill( m_aURL );
}
......
svl/source/numbers/numfmuno.cxx
Dosyayı görüntüle @ 69660f21
......@@ -402,7 +402,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber(
rtl::OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName()
throw(uno::RuntimeException)
{
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject"));
return rtl::OUString("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject");
}
sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const rtl::OUString& ServiceName )
......@@ -416,7 +416,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedS
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATTER));
pArray[0] = rtl::OUString(SERVICENAME_NUMBERFORMATTER);
return aRet;
}
......@@ -692,7 +692,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const
rtl::OUString SAL_CALL SvNumberFormatsObj::getImplementationName()
throw(uno::RuntimeException)
{
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatsObj"));
return rtl::OUString("SvNumberFormatsObj");
}
sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const rtl::OUString& ServiceName )
......@@ -706,7 +706,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNam
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATS));
pArray[0] = rtl::OUString(SERVICENAME_NUMBERFORMATS);
return aRet;
}
......@@ -907,31 +907,31 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
uno::Sequence<beans::PropertyValue> aSeq(13);
beans::PropertyValue* pArray = aSeq.getArray();
pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FMTSTR ));
pArray[0].Name = rtl::OUString(PROPERTYNAME_FMTSTR );
pArray[0].Value <<= rtl::OUString( aFmtStr );
pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LOCALE ));
pArray[1].Name = rtl::OUString(PROPERTYNAME_LOCALE );
pArray[1].Value <<= aLocale;
pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_TYPE ));
pArray[2].Name = rtl::OUString(PROPERTYNAME_TYPE );
pArray[2].Value <<= (sal_Int16)( pFormat->GetType() );
pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMMENT ));
pArray[3].Name = rtl::OUString(PROPERTYNAME_COMMENT );
pArray[3].Value <<= rtl::OUString( aComment );
pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_STDFORM ));
pArray[4].Name = rtl::OUString(PROPERTYNAME_STDFORM );
pArray[4].Value.setValue( &bStandard, getBooleanCppuType() );
pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_USERDEF ));
pArray[5].Name = rtl::OUString(PROPERTYNAME_USERDEF );
pArray[5].Value.setValue( &bUserDef, getBooleanCppuType() );
pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_DECIMALS ));
pArray[6].Name = rtl::OUString(PROPERTYNAME_DECIMALS );
pArray[6].Value <<= (sal_Int16)( nDecimals );
pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LEADING ));
pArray[7].Name = rtl::OUString(PROPERTYNAME_LEADING );
pArray[7].Value <<= (sal_Int16)( nLeading );
pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_NEGRED ));
pArray[8].Name = rtl::OUString(PROPERTYNAME_NEGRED );
pArray[8].Value.setValue( &bRed, getBooleanCppuType() );
pArray[9].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_THOUS ));
pArray[9].Name = rtl::OUString(PROPERTYNAME_THOUS );
pArray[9].Value.setValue( &bThousand, getBooleanCppuType() );
pArray[10].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRSYM ));
pArray[10].Name = rtl::OUString(PROPERTYNAME_CURRSYM );
pArray[10].Value <<= rtl::OUString( aSymbol );
pArray[11].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURREXT ));
pArray[11].Name = rtl::OUString(PROPERTYNAME_CURREXT );
pArray[11].Value <<= rtl::OUString( aExt );
pArray[12].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRABB ));
pArray[12].Name = rtl::OUString(PROPERTYNAME_CURRABB );
pArray[12].Value <<= rtl::OUString( aAbb );
return aSeq;
......@@ -953,7 +953,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
rtl::OUString SAL_CALL SvNumberFormatObj::getImplementationName()
throw(uno::RuntimeException)
{
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatObj"));
return rtl::OUString("SvNumberFormatObj");
}
sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const rtl::OUString& ServiceName )
......@@ -967,7 +967,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceName
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMAT));
pArray[0] = rtl::OUString(SERVICENAME_NUMBERFORMAT);
return aRet;
}
......@@ -1116,7 +1116,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl
rtl::OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName()
throw(uno::RuntimeException)
{
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatSettingsObj"));
return rtl::OUString("SvNumberFormatSettingsObj");
}
sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const rtl::OUString& ServiceName )
......@@ -1130,7 +1130,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedSer
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERSETTINGS));
pArray[0] = rtl::OUString(SERVICENAME_NUMBERSETTINGS);
return aRet;
}
......
svl/source/numbers/supservs.cxx
Dosyayı görüntüle @ 69660f21
......@@ -43,7 +43,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::utl;
#define PERSISTENT_SERVICE_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier"));
#define PERSISTENT_SERVICE_NAME ::rtl::OUString("com.sun.star.util.NumberFormatsSupplier");
//-------------------------------------------------------------------------
Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
......@@ -128,7 +128,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException)
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"));
return ::rtl::OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
}
//-------------------------------------------------------------------------
......
svl/source/passwordcontainer/syscreds.cxx
Dosyayı görüntüle @ 69660f21
......@@ -33,14 +33,13 @@ using namespace com::sun::star;
SysCredentialsConfigItem::SysCredentialsConfigItem(
SysCredentialsConfig * pOwner )
: utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Passwords")),
: utl::ConfigItem( rtl::OUString("Office.Common/Passwords"),
CONFIG_MODE_IMMEDIATE_UPDATE ),
m_bInited( false ),
m_pOwner( pOwner )
{
uno::Sequence< ::rtl::OUString > aNode( 1 );
aNode[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"Office.Common/Passwords/AuthenticateUsingSystemCredentials" ));
aNode[ 0 ] = rtl::OUString( "Office.Common/Passwords/AuthenticateUsingSystemCredentials" );
EnableNotification( aNode );
}
......@@ -70,8 +69,7 @@ SysCredentialsConfigItem::getSystemCredentialsURLs()
{
// read config item
uno::Sequence< ::rtl::OUString > aPropNames( 1 );
aPropNames[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"AuthenticateUsingSystemCredentials" ));
aPropNames[ 0 ] = rtl::OUString( "AuthenticateUsingSystemCredentials" );
uno::Sequence< uno::Any > aAnyValues(
utl::ConfigItem::GetProperties( aPropNames ) );
......@@ -99,9 +97,7 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs(
// write config item.
uno::Sequence< rtl::OUString > aPropNames( 1 );
uno::Sequence< uno::Any > aPropValues( 1 );
aPropNames[ 0 ]
= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"AuthenticateUsingSystemCredentials" ));
aPropNames[ 0 ] = ::rtl::OUString( "AuthenticateUsingSystemCredentials" );
aPropValues[ 0 ] <<= seqURLList;
utl::ConfigItem::SetModified();
......@@ -123,7 +119,7 @@ namespace
if( aInd > 0 )
{
sal_Int32 aPrevInd = aURL.lastIndexOf( sal_Unicode( '/' ), aInd );
if ( aURL.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("://")) )
if ( aURL.indexOf( ::rtl::OUString("://") )
!= aPrevInd - 2 ||
aInd != aURL.getLength() - 1 )
{
......@@ -157,7 +153,7 @@ namespace
{
::rtl::OUString tmpUrl( aUrl );
if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' )
tmpUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
tmpUrl += ::rtl::OUString("/");
aIter = rContainer.lower_bound( tmpUrl );
if( aIter != rContainer.end() && aIter->match( tmpUrl ) )
......
svl/source/uno/pathservice.cxx
Dosyayı görüntüle @ 69660f21
......@@ -50,7 +50,7 @@ public:
virtual OUString SAL_CALL getImplementationName()
throw(css::uno::RuntimeException)
{
return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svl.PathService"));
return OUString("com.sun.star.comp.svl.PathService");
}
virtual sal_Bool SAL_CALL supportsService (
......@@ -64,7 +64,7 @@ public:
throw(css::uno::RuntimeException)
{
css::uno::Sequence< OUString > aRet(1);
aRet.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager"));
aRet.getArray()[0] = OUString("com.sun.star.config.SpecialConfigManager");
return aRet;
}
......
svl/source/uno/registerservices.cxx
Dosyayı görüntüle @ 69660f21
......@@ -67,7 +67,7 @@ SVL_DLLPUBLIC void* SAL_CALL svl_component_getFactory (
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier"));
OUString("com.sun.star.util.NumberFormatsSupplier");
xFactory = ::cppu::createSingleFactory(
reinterpret_cast< css::lang::XMultiServiceFactory* >(_pServiceManager),
......@@ -81,7 +81,7 @@ SVL_DLLPUBLIC void* SAL_CALL svl_component_getFactory (
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"));
OUString("com.sun.star.util.NumberFormatter");
xFactory = ::cppu::createSingleFactory(
reinterpret_cast< css::lang::XMultiServiceFactory* >(_pServiceManager),
......@@ -94,7 +94,7 @@ SVL_DLLPUBLIC void* SAL_CALL svl_component_getFactory (
{
Sequence< OUString > aServiceNames(1);
aServiceNames.getArray()[0] =
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager"));
OUString("com.sun.star.config.SpecialConfigManager");
xFactory = ::cppu::createSingleFactory (
reinterpret_cast< css::lang::XMultiServiceFactory* >( _pServiceManager ),
OUString::createFromAscii( pImplementationName ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment