diff options
| author | Julien Nabet <serval@ilapharm.com> | 2010-11-23 22:41:07 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-11-24 07:56:52 +0100 |
| commit | 648589a0bd6c72b8b6b125644b43c6efad17ead1 (patch) | |
| tree | 9c519a5c237c05f2e8541f0afa1e646e4e154381 /package/source/zippackage | |
| parent | 95e7e542438384975a95e7309e23a07a0986fcc7 (diff) | |
RTL patch
Diffstat (limited to 'package/source/zippackage')
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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& ) { |