Skip to content

C
core
Kaydet (Commit) e190307f authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

package: kill remaining RTL_CONSTASCII.*PARAM 

Change-Id: Ia53ddbfcf68524b7714fe6df447a9dbb1a68bcb7
üst 8be8bcf7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 81 deletions
package/source/manifest/ManifestImport.cxx
Dosyayı görüntüle @ e190307f
......@@ -39,59 +39,59 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV
, nDerivedKeySize( 0 )
, rManVector ( rNewManVector )
, sFileEntryElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) )
, sManifestElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_MANIFEST ) )
, sEncryptionDataElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ENCRYPTION_DATA ) )
, sAlgorithmElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ALGORITHM ) )
, sStartKeyAlgElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_START_KEY_GENERATION ) )
, sKeyDerivationElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_KEY_DERIVATION ) )
, sCdataAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) )
, sMediaTypeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) )
, sVersionAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) )
, sFullPathAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) )
, sSizeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) )
, sSaltAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) )
, sInitialisationVectorAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_INITIALISATION_VECTOR ) )
, sIterationCountAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ITERATION_COUNT ) )
, sKeySizeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_SIZE ) )
, sAlgorithmNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ALGORITHM_NAME ) )
, sStartKeyAlgNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_START_KEY_GENERATION_NAME ) )
, sKeyDerivationNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_DERIVATION_NAME ) )
, sChecksumAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM ) )
, sChecksumTypeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM_TYPE ) )
, sFullPathProperty ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) )
, sMediaTypeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) )
, sVersionProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) )
, sIterationCountProperty ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) )
, sDerivedKeySizeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "DerivedKeySize" ) )
, sSaltProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) )
, sInitialisationVectorProperty ( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) )
, sSizeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) )
, sDigestProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) )
, sEncryptionAlgProperty ( RTL_CONSTASCII_USTRINGPARAM ( "EncryptionAlgorithm" ) )
, sStartKeyAlgProperty ( RTL_CONSTASCII_USTRINGPARAM ( "StartKeyAlgorithm" ) )
, sDigestAlgProperty ( RTL_CONSTASCII_USTRINGPARAM ( "DigestAlgorithm" ) )
, sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) )
, sSHA256_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL ) )
, sSHA1_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_NAME ) )
, sSHA1_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_URL ) )
, sSHA256_1k_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_1K_URL ) )
, sSHA1_1k_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_1K_NAME ) )
, sSHA1_1k_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_1K_URL ) )
, sBlowfish_Name ( RTL_CONSTASCII_USTRINGPARAM ( BLOWFISH_NAME ) )
, sBlowfish_URL ( RTL_CONSTASCII_USTRINGPARAM ( BLOWFISH_URL ) )
, sAES128_URL ( RTL_CONSTASCII_USTRINGPARAM ( AES128_URL ) )
, sAES192_URL ( RTL_CONSTASCII_USTRINGPARAM ( AES192_URL ) )
, sAES256_URL ( RTL_CONSTASCII_USTRINGPARAM ( AES256_URL ) )
, sPBKDF2_Name ( RTL_CONSTASCII_USTRINGPARAM ( PBKDF2_NAME ) )
, sPBKDF2_URL ( RTL_CONSTASCII_USTRINGPARAM ( PBKDF2_URL ) )
, sFileEntryElement ( ELEMENT_FILE_ENTRY )
, sManifestElement ( ELEMENT_MANIFEST )
, sEncryptionDataElement( ELEMENT_ENCRYPTION_DATA )
, sAlgorithmElement ( ELEMENT_ALGORITHM )
, sStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION )
, sKeyDerivationElement( ELEMENT_KEY_DERIVATION )
, sCdataAttribute ( ATTRIBUTE_CDATA )
, sMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE )
, sVersionAttribute ( ATTRIBUTE_VERSION )
, sFullPathAttribute ( ATTRIBUTE_FULL_PATH )
, sSizeAttribute ( ATTRIBUTE_SIZE )
, sSaltAttribute ( ATTRIBUTE_SALT )
, sInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR )
, sIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT )
, sKeySizeAttribute ( ATTRIBUTE_KEY_SIZE )
, sAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME )
, sStartKeyAlgNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME )
, sKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME )
, sChecksumAttribute ( ATTRIBUTE_CHECKSUM )
, sChecksumTypeAttribute ( ATTRIBUTE_CHECKSUM_TYPE )
, sFullPathProperty ( "FullPath" )
, sMediaTypeProperty ( "MediaType" )
, sVersionProperty ( "Version" )
, sIterationCountProperty ( "IterationCount" )
, sDerivedKeySizeProperty ( "DerivedKeySize" )
, sSaltProperty ( "Salt" )
, sInitialisationVectorProperty ( "InitialisationVector" )
, sSizeProperty ( "Size" )
, sDigestProperty ( "Digest" )
, sEncryptionAlgProperty ( "EncryptionAlgorithm" )
, sStartKeyAlgProperty ( "StartKeyAlgorithm" )
, sDigestAlgProperty ( "DigestAlgorithm" )
, sWhiteSpace ( " " )
, sSHA256_URL ( SHA256_URL )
, sSHA1_Name ( SHA1_NAME )
, sSHA1_URL ( SHA1_URL )
, sSHA256_1k_URL ( SHA256_1K_URL )
, sSHA1_1k_Name ( SHA1_1K_NAME )
, sSHA1_1k_URL ( SHA1_1K_URL )
, sBlowfish_Name ( BLOWFISH_NAME )
, sBlowfish_URL ( BLOWFISH_URL )
, sAES128_URL ( AES128_URL )
, sAES192_URL ( AES192_URL )
, sAES256_URL ( AES256_URL )
, sPBKDF2_Name ( PBKDF2_NAME )
, sPBKDF2_URL ( PBKDF2_URL )
{
aStack.reserve( 10 );
}
......@@ -458,7 +458,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
&& ( aIter->second == MANIFEST_NAMESPACE || aIter->second == MANIFEST_OASIS_NAMESPACE ) )
{
// no check for manifest.xml consistency currently since the old versions have supported inconsistent documents as well
aResult = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MANIFEST_NSPREFIX ) );
aResult = MANIFEST_NSPREFIX;
aResult += aPureName;
}
......
package/source/manifest/ManifestReader.cxx
Dosyayı görüntüle @ e190307f
......@@ -57,7 +57,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSeque
Reference < XDocumentHandler > xFilter = new ManifestImport( aManVector );
InputSource aParserInput;
aParserInput.aInputStream = rStream;
aParserInput.sSystemId = OUString ( RTL_CONSTASCII_USTRINGPARAM ( "META-INF/manifest.xml" ) );
aParserInput.sSystemId = "META-INF/manifest.xml";
xParser->setDocumentHandler ( xFilter );
xParser->parseStream( aParserInput );
aManifestSequence.realloc ( aManVector.size() );
......@@ -87,7 +87,7 @@ Reference < XInterface > SAL_CALL ManifestReader_createInstance( Reference< XMul
}
OUString ManifestReader::static_getImplementationName()
{
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.comp.ManifestReader" ) );
return OUString( "com.sun.star.packages.manifest.comp.ManifestReader" );
}
sal_Bool SAL_CALL ManifestReader::static_supportsService(OUString const & rServiceName)
......@@ -98,7 +98,7 @@ sal_Bool SAL_CALL ManifestReader::static_supportsService(OUString const & rServi
Sequence < OUString > ManifestReader::static_getSupportedServiceNames()
{
Sequence < OUString > aNames(1);
aNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.ManifestReader" ) );
aNames[0] = "com.sun.star.packages.manifest.ManifestReader";
return aNames;
}
......
package/source/manifest/ManifestWriter.cxx
Dosyayı görüntüle @ e190307f
......@@ -60,7 +60,7 @@ void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStr
}
catch( SAXException& )
{
throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
throw RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
}
}
......@@ -72,7 +72,7 @@ Reference < XInterface > SAL_CALL ManifestWriter_createInstance( Reference< XMul
OUString ManifestWriter::static_getImplementationName()
{
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.comp.ManifestWriter" ) );
return OUString ( "com.sun.star.packages.manifest.comp.ManifestWriter" );
}
sal_Bool SAL_CALL ManifestWriter::static_supportsService(OUString const & rServiceName)
......@@ -82,7 +82,7 @@ sal_Bool SAL_CALL ManifestWriter::static_supportsService(OUString const & rServi
Sequence < OUString > ManifestWriter::static_getSupportedServiceNames()
{
Sequence < OUString > aNames(1);
aNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.manifest.ManifestWriter" ) );
aNames[0] = "com.sun.star.packages.manifest.ManifestWriter";
return aNames;
}
......
package/source/xstor/ohierarchyholder.cxx
Dosyayı görüntüle @ e190307f
......@@ -329,7 +329,7 @@ void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::Ev
catch( const uno::Exception& e )
{
throw lang::WrappedTargetRuntimeException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not commit storage sequence!" ) ),
"Can not commit storage sequence!",
uno::Reference< uno::XInterface >(),
uno::makeAny( e ) );
}
......
package/source/xstor/oseekinstream.cxx
Dosyayı görüntüle @ e190307f
......@@ -115,13 +115,13 @@ void SAL_CALL OInputSeekStream::seek( sal_Int64 location )
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
throw lang::DisposedException();
}
if ( !m_xSeekable.is() )
{
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No seekable!" ) ) );
::package::StaticAddLog( OSL_LOG_PREFIX "No seekable!" );
throw uno::RuntimeException();
}
......@@ -135,13 +135,13 @@ sal_Int64 SAL_CALL OInputSeekStream::getPosition()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
throw lang::DisposedException();
}
if ( !m_xSeekable.is() )
{
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No seekable!" ) ) );
::package::StaticAddLog( OSL_LOG_PREFIX "No seekable!" );
throw uno::RuntimeException();
}
......@@ -155,13 +155,13 @@ sal_Int64 SAL_CALL OInputSeekStream::getLength()
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
{
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
throw lang::DisposedException();
}
if ( !m_xSeekable.is() )
{
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No seekable!" ) ) );
::package::StaticAddLog( OSL_LOG_PREFIX "No seekable!" );
throw uno::RuntimeException();
}
......
package/source/xstor/xfactory.cxx
Dosyayı görüntüle @ e190307f
......@@ -60,15 +60,15 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x
uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory") );
aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.StorageFactory") );
aRet[0] = "com.sun.star.embed.StorageFactory";
aRet[1] = "com.sun.star.comp.embed.StorageFactory";
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName()
OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName()
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.StorageFactory") );
return OUString("com.sun.star.comp.embed.StorageFactory");
}
//-------------------------------------------------------------------------
......@@ -147,7 +147,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
throw lang::IllegalArgumentException(); // TODO:
}
if ( aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg")) )
if ( aURL.equalsIgnoreAsciiCase("vnd.sun.star.pkg") )
{
OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ???
throw lang::IllegalArgumentException(); // TODO:
......@@ -181,17 +181,17 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
if ( !aURL.isEmpty() )
{
aPropsToSet.realloc(1);
aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") );
aPropsToSet[0].Name = "URL";
aPropsToSet[0].Value <<= aURL;
}
for ( sal_Int32 nInd = 0, nNumArgs = 1; nInd < aDescr.getLength(); nInd++ )
{
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:
if ( aDescr[nInd].Name == "InteractionHandler"
|| aDescr[nInd].Name == "Password"
|| aDescr[nInd].Name == "RepairPackage"
|| aDescr[nInd].Name == "StatusIndicator" )
// || aDescr[nInd].Name == "Unpacked" ) // TODO:
{
aPropsToSet.realloc( ++nNumArgs );
aPropsToSet[nNumArgs-1].Name = aDescr[nInd].Name;
......@@ -210,19 +210,19 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
else if ( aFormatName.equals( OFOPXML_STORAGE_FORMAT_STRING ) )
nStorageType = embed::StorageFormats::OFOPXML;
else
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 );
throw lang::IllegalArgumentException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >(), 1 );
}
else if ( aDescr[nInd].Value >>= nFormatID )
{
if ( nFormatID != embed::StorageFormats::PACKAGE
&& nFormatID != embed::StorageFormats::ZIP
&& nFormatID != embed::StorageFormats::OFOPXML )
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 );
throw lang::IllegalArgumentException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >(), 1 );
nStorageType = nFormatID;
}
else
throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 );
throw lang::IllegalArgumentException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >(), 1 );
}
else
OSL_FAIL( "Unacceptable property, will be ignored!\n" );
......
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