summaryrefslogtreecommitdiff
path: root/package/source
diff options
context:
space:
mode:
Diffstat (limited to 'package/source')
-rw-r--r--package/source/xstor/ocompinstream.cxx4
-rw-r--r--package/source/xstor/owriteablestream.cxx40
-rw-r--r--package/source/xstor/xfactory.cxx12
-rw-r--r--package/source/xstor/xstorage.cxx62
-rw-r--r--package/source/zippackage/ZipPackage.cxx10
5 files changed, 64 insertions, 64 deletions
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 50333b0d4982..1a95d186e7be 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -657,12 +657,12 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
}
::rtl::OUString aPropertyName;
- if ( aProp.equalsAscii( "IsEncrypted" ) )
+ if ( aProp.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsEncrypted" ) ) )
aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) );
else
aPropertyName = aProp;
- if ( aPropertyName.equalsAscii( "RelationsInfo" ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) )
throw beans::UnknownPropertyException(); // TODO
// all the provided properties are accessible
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 54394eacce76..c4aa0647f3b1 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -388,7 +388,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
sal_Bool bToBeEncr = sal_False;
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
- if ( m_aProps[nInd].Name.equalsAscii( "Encrypted" ) )
+ if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) )
{
if ( !( m_aProps[nInd].Value >>= bToBeEncr ) )
{
@@ -439,7 +439,7 @@ void OWriteStream_Impl::SetDecrypted()
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
- if ( m_aProps[nInd].Name.equalsAscii( "Encrypted" ) )
+ if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) )
m_aProps[nInd].Value <<= sal_False;
}
}
@@ -460,7 +460,7 @@ void OWriteStream_Impl::SetEncryptedWithPass( const ::rtl::OUString& aPass )
// introduce encryption info
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
- if ( m_aProps[nInd].Name.equalsAscii( "Encrypted" ) )
+ if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) )
m_aProps[nInd].Value <<= sal_True;
}
@@ -797,7 +797,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
{
xPropertySet->setPropertyValue( aProps[nInd].Name, aProps[nInd].Value );
}
- else if ( m_nStorageType == embed::StorageFormats::PACKAGE && aProps[nInd].Name.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
+ else if ( m_nStorageType == embed::StorageFormats::PACKAGE && aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) )
aProps[nInd].Value >>= m_bUseCommonPass;
else
throw lang::IllegalArgumentException();
@@ -904,7 +904,7 @@ void OWriteStream_Impl::Commit()
for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
{
- if ( m_aProps[nInd].Name.equalsAscii( "Size" ) )
+ if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
{
if ( m_pAntiImpl && !m_bHasInsertedStreamOptimization && m_pAntiImpl->m_xSeekable.is() )
{
@@ -1017,7 +1017,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
if ( m_nStorageType == embed::StorageFormats::PACKAGE )
{
for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
- if ( aResult[nInd].Name.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
+ if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) )
{
aResult[nInd].Value <<= bUseCommonPass;
return aResult;
@@ -1041,7 +1041,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
uno::Reference< uno::XInterface >() );
for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
- if ( aResult[nInd].Name.equalsAscii( "RelationsInfo" ) )
+ if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) )
{
aResult[nInd].Value = aValue;
return aResult;
@@ -2458,7 +2458,7 @@ void OWriteStream::CloseOutput_Impl()
for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ )
{
- if ( m_pImpl->m_aProps[nInd].Name.equalsAscii( "Size" ) )
+ if ( m_pImpl->m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
m_pImpl->m_aProps[nInd].Value <<= ((sal_Int32)m_xSeekable->getLength());
}
}
@@ -3170,7 +3170,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
}
}
else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
- && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
+ && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) )
{
sal_Bool bUseCommonPass = sal_False;
if ( aValue >>= bUseCommonPass )
@@ -3202,7 +3202,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
m_pImpl->m_aProps[nInd].Value = aValue;
}
}
- else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAscii( "RelationsInfoStream" ) )
+ else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfoStream" ) ) )
{
uno::Reference< io::XInputStream > xInRelStream;
if ( ( aValue >>= xInRelStream ) && xInRelStream.is() )
@@ -3223,7 +3223,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
else
throw lang::IllegalArgumentException(); // TODO
}
- else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAscii( "RelationsInfo" ) )
+ else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) )
{
if ( aValue >>= m_pImpl->m_aNewRelInfo )
{
@@ -3231,10 +3231,10 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
else
throw lang::IllegalArgumentException(); // TODO
}
- else if ( aPropertyName.equalsAscii( "Size" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
throw beans::PropertyVetoException(); // TODO
else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
- && ( aPropertyName.equalsAscii( "IsEncrypted" ) || aPropertyName.equalsAscii( "Encrypted" ) ) )
+ && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsEncrypted" ) ) || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) )
throw beans::PropertyVetoException(); // TODO
else
throw beans::UnknownPropertyException(); // TODO
@@ -3258,21 +3258,21 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
throw lang::DisposedException();
}
- if ( aProp.equalsAscii( "RelId" ) )
+ if ( aProp.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelId" ) ) )
{
return uno::makeAny( m_pImpl->GetNewRelId() );
}
::rtl::OUString aPropertyName;
- if ( aProp.equalsAscii( "IsEncrypted" ) )
+ if ( aProp.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsEncrypted" ) ) )
aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) );
else
aPropertyName = aProp;
if ( ( ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE || m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
- && aPropertyName.equalsAscii( "MediaType" ) )
- || ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName.equalsAscii( "Encrypted" ) )
- || aPropertyName.equalsAscii( "Compressed" ) )
+ && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
+ || ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Compressed" ) ) )
{
m_pImpl->GetStreamProperties();
@@ -3283,9 +3283,9 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
}
}
else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
- && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
+ && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) )
return uno::makeAny( m_pImpl->m_bUseCommonPass );
- else if ( aPropertyName.equalsAscii( "Size" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
{
CheckInitOnDemand();
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index c7bc364ec674..e0e1ce8148e4 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -202,17 +202,17 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
for ( sal_Int32 nInd = 0, nNumArgs = 1; nInd < aDescr.getLength(); nInd++ )
{
- if ( aDescr[nInd].Name.equalsAscii( "InteractionHandler" )
- || aDescr[nInd].Name.equalsAscii( "Password" )
- || aDescr[nInd].Name.equalsAscii( "RepairPackage" )
- || aDescr[nInd].Name.equalsAscii( "StatusIndicator" ) )
- // || aDescr[nInd].Name.equalsAscii( "Unpacked" ) // TODO:
+ if ( aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) )
+ || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) )
+ || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) )
+ || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
+ // || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Unpacked" ) ) // TODO:
{
aPropsToSet.realloc( ++nNumArgs );
aPropsToSet[nNumArgs-1].Name = aDescr[nInd].Name;
aPropsToSet[nNumArgs-1].Value = aDescr[nInd].Value;
}
- else if ( aDescr[nInd].Name.equalsAscii( "StorageFormat" ) )
+ else if ( aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StorageFormat" ) ) )
{
::rtl::OUString aFormatName;
sal_Int32 nFormatID = 0;
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index a99170749a0d..e89eeb480fa7 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -488,15 +488,15 @@ void OStorage_Impl::OpenOwnPackage()
sal_Int32 nArgNum = 2;
for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); aInd++ )
{
- if ( m_xProperties[aInd].Name.equalsAscii( "RepairPackage" )
- || m_xProperties[aInd].Name.equalsAscii( "ProgressHandler" ) )
+ if ( m_xProperties[aInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) )
+ || m_xProperties[aInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ProgressHandler" ) ) )
{
beans::NamedValue aNamedValue( m_xProperties[aInd].Name,
m_xProperties[aInd].Value );
aArguments.realloc( ++nArgNum );
aArguments[nArgNum-1] <<= aNamedValue;
}
- else if ( m_xProperties[aInd].Name.equalsAscii( "Password" ) )
+ else if ( m_xProperties[aInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) )
{
// TODO: implement password setting for documents
// the password entry must be removed after setting
@@ -4779,7 +4779,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
{
- if ( aPropertyName.equalsAscii( "MediaType" ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
{
aValue >>= m_pImpl->m_aMediaType;
m_pImpl->m_bControlMediaType = sal_True;
@@ -4787,7 +4787,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
m_pImpl->m_bBroadcastModified = sal_True;
m_pImpl->m_bIsModified = sal_True;
}
- else if ( aPropertyName.equalsAscii( "Version" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) )
{
aValue >>= m_pImpl->m_aVersion;
m_pImpl->m_bControlVersion = sal_True;
@@ -4799,20 +4799,20 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
m_pImpl->m_bIsModified = sal_True;
}
}
- else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "HasEncryptedEntries" )
- || aPropertyName.equalsAscii( "HasNonEncryptedEntries" )
- || aPropertyName.equalsAscii( "IsInconsistent" )
- || aPropertyName.equalsAscii( "URL" )
- || aPropertyName.equalsAscii( "RepairPackage" ) ) )
- || aPropertyName.equalsAscii( "IsRoot" )
- || aPropertyName.equalsAscii( "MediaTypeFallbackUsed" ) )
+ else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasEncryptedEntries" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasNonEncryptedEntries" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsInconsistent" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaTypeFallbackUsed" ) ) )
throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
else
throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
}
else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
{
- if ( aPropertyName.equalsAscii( "RelationsInfoStream" ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfoStream" ) ) )
{
uno::Reference< io::XInputStream > xInRelStream;
if ( ( aValue >>= xInRelStream ) && xInRelStream.is() )
@@ -4835,7 +4835,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
else
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
}
- else if ( aPropertyName.equalsAscii( "RelationsInfo" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) )
{
if ( aValue >>= m_pImpl->m_aRelInfo )
{
@@ -4847,9 +4847,9 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName,
else
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 );
}
- else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "URL" )
- || aPropertyName.equalsAscii( "RepairPackage" ) ) )
- || aPropertyName.equalsAscii( "IsRoot" ) )
+ else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) ) )
throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
else
throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -4878,9 +4878,9 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
}
if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
- && ( aPropertyName.equalsAscii( "MediaType" )
- || aPropertyName.equalsAscii( "MediaTypeFallbackUsed" )
- || aPropertyName.equalsAscii( "Version" ) ) )
+ && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaTypeFallbackUsed" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) ) )
{
try
{
@@ -4904,25 +4904,25 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
aCaught );
}
- if ( aPropertyName.equalsAscii( "MediaType" ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
return uno::makeAny( m_pImpl->m_aMediaType );
- else if ( aPropertyName.equalsAscii( "Version" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) )
return uno::makeAny( m_pImpl->m_aVersion );
else
return uno::makeAny( m_pImpl->m_bMTFallbackUsed );
}
- else if ( aPropertyName.equalsAscii( "IsRoot" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) ) )
{
return uno::makeAny( m_pData->m_bIsRoot );
}
- else if ( aPropertyName.equalsAscii( "OpenMode" ) )
+ else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenMode" ) ) )
{
return uno::makeAny( m_pImpl->m_nStorageMode );
}
else if ( m_pData->m_bIsRoot )
{
- if ( aPropertyName.equalsAscii( "URL" )
- || aPropertyName.equalsAscii( "RepairPackage" ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) )
{
for ( sal_Int32 aInd = 0; aInd < m_pImpl->m_xProperties.getLength(); aInd++ )
{
@@ -4930,15 +4930,15 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa
return m_pImpl->m_xProperties[aInd].Value;
}
- if ( aPropertyName.equalsAscii( "URL" ) )
+ if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
return uno::makeAny( ::rtl::OUString() );
return uno::makeAny( sal_False ); // RepairPackage
}
else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
- && ( aPropertyName.equalsAscii( "HasEncryptedEntries" )
- || aPropertyName.equalsAscii( "HasNonEncryptedEntries" )
- || aPropertyName.equalsAscii( "IsInconsistent" ) ) )
+ && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasEncryptedEntries" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasNonEncryptedEntries" ) )
+ || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsInconsistent" ) ) ) )
{
try {
m_pImpl->ReadContents();
@@ -5843,7 +5843,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle
throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
// TODO/LATER: Currently it is only implemented for MediaType property of substorages, might be changed in future
- if ( !pElement->m_bIsStorage || m_pData->m_nStorageType != embed::StorageFormats::PACKAGE || !aPropertyName.equalsAscii( "MediaType" ) )
+ if ( !pElement->m_bIsStorage || m_pData->m_nStorageType != embed::StorageFormats::PACKAGE || !aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
if ( !pElement->m_pStorage )
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index b8072bf12bba..b18f32140244 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -654,9 +654,9 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
}
else if ( ( aArguments[ind] >>= aNamedValue ) )
{
- if ( aNamedValue.Name.equalsAscii( "RepairPackage" ) )
+ if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) )
aNamedValue.Value >>= m_bForceRecovery;
- else if ( aNamedValue.Name.equalsAscii( "PackageFormat" ) )
+ else if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PackageFormat" ) ) )
{
// setting this argument to true means Package format
// setting it to false means plain Zip format
@@ -668,7 +668,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
m_pRootFolder->setPackageFormat_Impl( m_nFormat );
}
- else if ( aNamedValue.Name.equalsAscii( "StorageFormat" ) )
+ else if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StorageFormat" ) ) )
{
::rtl::OUString aFormatName;
sal_Int32 nFormatID = 0;
@@ -697,14 +697,14 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
m_pRootFolder->setPackageFormat_Impl( m_nFormat );
}
- else if ( aNamedValue.Name.equalsAscii( "AllowRemoveOnInsert" ) )
+ else if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AllowRemoveOnInsert" ) ) )
{
aNamedValue.Value >>= m_bAllowRemoveOnInsert;
m_pRootFolder->setRemoveOnInsertMode_Impl( m_bAllowRemoveOnInsert );
}
// for now the progress handler is not used, probably it will never be
- // if ( aNamedValue.Name.equalsAscii( "ProgressHandler" )
+ // if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ProgressHandler" ) )
}
else
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 09:44:45 +0000