summaryrefslogtreecommitdiff
path: root/package/source
diff options
context:
space:
mode:
Diffstat (limited to 'package/source')
-rw-r--r--package/source/manifest/UnoRegister.cxx4
-rw-r--r--package/source/zipapi/ZipFile.cxx6
-rw-r--r--package/source/zippackage/ZipPackage.cxx12
3 files changed, 11 insertions, 11 deletions
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 8a234a750d8b..51b7ea431de5 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -50,9 +50,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
const OUString & rImplementationName,
Sequence< OUString > const & rServiceNames )
{
- OUString aKeyName( OUString::createFromAscii( "/" ) );
+ OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
aKeyName += rImplementationName;
- aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
Reference< XRegistryKey > xKey;
try
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 969fa64d1720..475bcea9af7c 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -291,7 +291,7 @@ Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const Reference<
throw ( packages::WrongPasswordException, ZipIOException, RuntimeException )
{
if ( !rData.is() )
- throw ZipIOException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ),
+ throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )),
Reference< XInterface >() );
if ( !rData->aKey.getLength() )
@@ -299,7 +299,7 @@ Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const Reference<
Reference< XSeekable > xSeek( xStream, UNO_QUERY );
if ( !xSeek.is() )
- throw ZipIOException( OUString::createFromAscii( "The stream must be seekable!\n" ),
+ throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "The stream must be seekable!\n" )),
Reference< XInterface >() );
@@ -559,7 +559,7 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
// in case no digest is provided there is no way
// to detect password correctness
if ( !rData.is() )
- throw ZipException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ),
+ throw ZipException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )),
Reference< XInterface >() );
// if we have a digest, then this file is an encrypted one and we should
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 4af932d6999c..e445b9ea0bb1 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -596,18 +596,18 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
do
{
::rtl::OUString aCommand = aParam.getToken( 0, '&', nIndex );
- if ( aCommand.equals( OUString::createFromAscii( "repairpackage" ) ) )
+ if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "repairpackage" )) ) )
{
m_bForceRecovery = sal_True;
break;
}
- else if ( aCommand.equals( OUString::createFromAscii( "purezip" ) ) )
+ else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "purezip" )) ) )
{
m_nFormat = embed::StorageFormats::ZIP;
m_pRootFolder->setPackageFormat_Impl( m_nFormat );
break;
}
- else if ( aCommand.equals( OUString::createFromAscii( "ofopxml" ) ) )
+ else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "ofopxml" )) ) )
{
m_nFormat = embed::StorageFormats::OFOPXML;
m_pRootFolder->setPackageFormat_Impl( m_nFormat );
@@ -620,7 +620,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
m_aURL = aParamUrl;
Content aContent ( m_aURL, uno::Reference < XCommandEnvironment >() );
- Any aAny = aContent.getPropertyValue( OUString::createFromAscii( "Size" ) );
+ Any aAny = aContent.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )) );
sal_uInt64 aSize = 0;
// kind of optimisation: treat empty files as nonexistent files
// and write to such files directly. Note that "Size" property is optional.
@@ -1313,7 +1313,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
{
Exception aDetect;
sal_Int64 aSize = 0;
- Any aAny = aOriginalContent.setPropertyValue( OUString::createFromAscii( "Size" ), makeAny( aSize ) );
+ Any aAny = aOriginalContent.setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )), makeAny( aSize ) );
if( !( aAny >>= aDetect ) )
bTruncSuccess = sal_True;
}
@@ -1336,7 +1336,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
aArg.Sink = xSink;
aArg.Properties = Sequence< Property >( 0 ); // unused
- aOriginalContent.executeCommand( OUString::createFromAscii( "open" ), makeAny( aArg ) );
+ aOriginalContent.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM( "open" )), makeAny( aArg ) );
}
catch( Exception& )
{