package: kill remaining RTL_CONSTASCII.*PARAM
Change-Id: Ia53ddbfcf68524b7714fe6df447a9dbb1a68bcb7
This commit is contained in:
@@ -41,53 +41,53 @@ using ::rtl::OUStringBuffer;
|
||||
|
||||
ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHandler, const uno::Sequence< uno::Sequence < beans::PropertyValue > >& rManList )
|
||||
{
|
||||
const ::rtl::OUString sFileEntryElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) );
|
||||
const ::rtl::OUString sManifestElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_MANIFEST ) );
|
||||
const ::rtl::OUString sEncryptionDataElement( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ENCRYPTION_DATA ) );
|
||||
const ::rtl::OUString sAlgorithmElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_ALGORITHM ) );
|
||||
const ::rtl::OUString sStartKeyGenerationElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_START_KEY_GENERATION ) );
|
||||
const ::rtl::OUString sKeyDerivationElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_KEY_DERIVATION ) );
|
||||
const OUString sFileEntryElement ( ELEMENT_FILE_ENTRY );
|
||||
const OUString sManifestElement ( ELEMENT_MANIFEST );
|
||||
const OUString sEncryptionDataElement( ELEMENT_ENCRYPTION_DATA );
|
||||
const OUString sAlgorithmElement ( ELEMENT_ALGORITHM );
|
||||
const OUString sStartKeyGenerationElement ( ELEMENT_START_KEY_GENERATION );
|
||||
const OUString sKeyDerivationElement ( ELEMENT_KEY_DERIVATION );
|
||||
|
||||
const ::rtl::OUString sCdataAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CDATA ) );
|
||||
const ::rtl::OUString sMediaTypeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_MEDIA_TYPE ) );
|
||||
const ::rtl::OUString sVersionAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) );
|
||||
const ::rtl::OUString sFullPathAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_FULL_PATH ) );
|
||||
const ::rtl::OUString sSizeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SIZE ) );
|
||||
const ::rtl::OUString sKeySizeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_SIZE ) );
|
||||
const ::rtl::OUString sSaltAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_SALT ) );
|
||||
const ::rtl::OUString sInitialisationVectorAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_INITIALISATION_VECTOR ) );
|
||||
const ::rtl::OUString sIterationCountAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ITERATION_COUNT ) );
|
||||
const ::rtl::OUString sAlgorithmNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_ALGORITHM_NAME ) );
|
||||
const ::rtl::OUString sStartKeyGenerationNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_START_KEY_GENERATION_NAME ) );
|
||||
const ::rtl::OUString sKeyDerivationNameAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_KEY_DERIVATION_NAME ) );
|
||||
const ::rtl::OUString sChecksumTypeAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM_TYPE ) );
|
||||
const ::rtl::OUString sChecksumAttribute ( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_CHECKSUM) );
|
||||
const OUString sCdataAttribute ( ATTRIBUTE_CDATA );
|
||||
const OUString sMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE );
|
||||
const OUString sVersionAttribute ( ATTRIBUTE_VERSION );
|
||||
const OUString sFullPathAttribute ( ATTRIBUTE_FULL_PATH );
|
||||
const OUString sSizeAttribute ( ATTRIBUTE_SIZE );
|
||||
const OUString sKeySizeAttribute ( ATTRIBUTE_KEY_SIZE );
|
||||
const OUString sSaltAttribute ( ATTRIBUTE_SALT );
|
||||
const OUString sInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR );
|
||||
const OUString sIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT );
|
||||
const OUString sAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME );
|
||||
const OUString sStartKeyGenerationNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME );
|
||||
const OUString sKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME );
|
||||
const OUString sChecksumTypeAttribute ( ATTRIBUTE_CHECKSUM_TYPE );
|
||||
const OUString sChecksumAttribute ( ATTRIBUTE_CHECKSUM);
|
||||
|
||||
const ::rtl::OUString sFullPathProperty ( RTL_CONSTASCII_USTRINGPARAM ( "FullPath" ) );
|
||||
const ::rtl::OUString sVersionProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Version" ) );
|
||||
const ::rtl::OUString sMediaTypeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "MediaType" ) );
|
||||
const ::rtl::OUString sIterationCountProperty ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
|
||||
const ::rtl::OUString sDerivedKeySizeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "DerivedKeySize" ) );
|
||||
const ::rtl::OUString sSaltProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Salt" ) );
|
||||
const ::rtl::OUString sInitialisationVectorProperty( RTL_CONSTASCII_USTRINGPARAM ( "InitialisationVector" ) );
|
||||
const ::rtl::OUString sSizeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
|
||||
const ::rtl::OUString sDigestProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Digest" ) );
|
||||
const ::rtl::OUString sEncryptionAlgProperty ( RTL_CONSTASCII_USTRINGPARAM ( "EncryptionAlgorithm" ) );
|
||||
const ::rtl::OUString sStartKeyAlgProperty ( RTL_CONSTASCII_USTRINGPARAM ( "StartKeyAlgorithm" ) );
|
||||
const ::rtl::OUString sDigestAlgProperty ( RTL_CONSTASCII_USTRINGPARAM ( "DigestAlgorithm" ) );
|
||||
const OUString sFullPathProperty ( "FullPath" );
|
||||
const OUString sVersionProperty ( "Version" );
|
||||
const OUString sMediaTypeProperty ( "MediaType" );
|
||||
const OUString sIterationCountProperty ( "IterationCount" );
|
||||
const OUString sDerivedKeySizeProperty ( "DerivedKeySize" );
|
||||
const OUString sSaltProperty ( "Salt" );
|
||||
const OUString sInitialisationVectorProperty( "InitialisationVector" );
|
||||
const OUString sSizeProperty ( "Size" );
|
||||
const OUString sDigestProperty ( "Digest" );
|
||||
const OUString sEncryptionAlgProperty ( "EncryptionAlgorithm" );
|
||||
const OUString sStartKeyAlgProperty ( "StartKeyAlgorithm" );
|
||||
const OUString sDigestAlgProperty ( "DigestAlgorithm" );
|
||||
|
||||
const ::rtl::OUString sWhiteSpace ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
|
||||
const OUString sWhiteSpace ( " " );
|
||||
|
||||
const ::rtl::OUString sSHA256_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL ) );
|
||||
const ::rtl::OUString sSHA1_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_NAME ) );
|
||||
const OUString sSHA256_URL ( SHA256_URL );
|
||||
const OUString sSHA1_Name ( SHA1_NAME );
|
||||
|
||||
const ::rtl::OUString sSHA1_1k_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_1K_NAME ) );
|
||||
const ::rtl::OUString sSHA256_1k_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_1K_URL ) );
|
||||
const OUString sSHA1_1k_Name ( SHA1_1K_NAME );
|
||||
const OUString sSHA256_1k_URL ( SHA256_1K_URL );
|
||||
|
||||
const ::rtl::OUString sBlowfish_Name ( RTL_CONSTASCII_USTRINGPARAM ( BLOWFISH_NAME ) );
|
||||
const ::rtl::OUString sAES256_URL ( RTL_CONSTASCII_USTRINGPARAM ( AES256_URL ) );
|
||||
const OUString sBlowfish_Name ( BLOWFISH_NAME );
|
||||
const OUString sAES256_URL ( AES256_URL );
|
||||
|
||||
const ::rtl::OUString sPBKDF2_Name ( RTL_CONSTASCII_USTRINGPARAM ( PBKDF2_NAME ) );
|
||||
const OUString sPBKDF2_Name ( PBKDF2_NAME );
|
||||
|
||||
::comphelper::AttributeList * pRootAttrList = new ::comphelper::AttributeList;
|
||||
const uno::Sequence < beans::PropertyValue > *pSequence = rManList.getConstArray();
|
||||
@@ -153,9 +153,9 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
|
||||
{
|
||||
// oasis format
|
||||
pRootAttrList->AddAttribute ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_XMLNS ) ),
|
||||
pRootAttrList->AddAttribute ( ATTRIBUTE_XMLNS,
|
||||
sCdataAttribute,
|
||||
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( MANIFEST_OASIS_NAMESPACE ) ) );
|
||||
MANIFEST_OASIS_NAMESPACE );
|
||||
bAcceptNonemptyVersion = sal_True;
|
||||
if ( aDocVersion.compareTo( ODFVER_012_TEXT ) >= 0 )
|
||||
{
|
||||
@@ -168,9 +168,9 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
{
|
||||
// even if it is no SO6 format the namespace must be specified
|
||||
// thus SO6 format is used as default one
|
||||
pRootAttrList->AddAttribute ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_XMLNS ) ),
|
||||
pRootAttrList->AddAttribute ( ATTRIBUTE_XMLNS,
|
||||
sCdataAttribute,
|
||||
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( MANIFEST_NAMESPACE ) ) );
|
||||
MANIFEST_NAMESPACE );
|
||||
|
||||
bProvideDTD = sal_True;
|
||||
}
|
||||
@@ -182,7 +182,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
uno::Reference < xml::sax::XExtendedDocumentHandler > xExtHandler ( xHandler, uno::UNO_QUERY );
|
||||
if ( xExtHandler.is() && bProvideDTD )
|
||||
{
|
||||
::rtl::OUString aDocType ( RTL_CONSTASCII_USTRINGPARAM ( MANIFEST_DOCTYPE ) );
|
||||
OUString aDocType ( MANIFEST_DOCTYPE );
|
||||
xExtHandler->unknown ( aDocType );
|
||||
xHandler->ignorableWhitespace ( sWhiteSpace );
|
||||
}
|
||||
@@ -261,7 +261,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
else if ( nDigestAlgID == xml::crypto::DigestID::SHA1_1K )
|
||||
sChecksumType = sSHA1_1k_Name;
|
||||
else
|
||||
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected digest algorithm is provided!" ) ), uno::Reference< uno::XInterface >() );
|
||||
throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected digest algorithm is provided!", uno::Reference< uno::XInterface >() );
|
||||
|
||||
pNewAttrList->AddAttribute ( sChecksumTypeAttribute, sCdataAttribute, sChecksumType );
|
||||
*pDigest >>= aSequence;
|
||||
@@ -284,7 +284,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
{
|
||||
OSL_ENSURE( nDerivedKeySize, "Unexpected key size is provided!" );
|
||||
if ( nDerivedKeySize != 32 )
|
||||
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected key size is provided!" ) ), uno::Reference< uno::XInterface >() );
|
||||
throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected key size is provided!", uno::Reference< uno::XInterface >() );
|
||||
|
||||
sEncAlgName = sAES256_URL;
|
||||
}
|
||||
@@ -293,7 +293,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
sEncAlgName = sBlowfish_Name;
|
||||
}
|
||||
else
|
||||
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected encryption algorithm is provided!" ) ), uno::Reference< uno::XInterface >() );
|
||||
throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected encryption algorithm is provided!", uno::Reference< uno::XInterface >() );
|
||||
|
||||
pNewAttrList->AddAttribute ( sAlgorithmNameAttribute, sCdataAttribute, sEncAlgName );
|
||||
|
||||
@@ -357,7 +357,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa
|
||||
sStartKeySize = aBuffer.makeStringAndClear();
|
||||
}
|
||||
else
|
||||
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected start key algorithm is provided!" ) ), uno::Reference< uno::XInterface >() );
|
||||
throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected start key algorithm is provided!", uno::Reference< uno::XInterface >() );
|
||||
|
||||
pNewAttrList->AddAttribute ( sStartKeyGenerationNameAttribute, sCdataAttribute, sStartKeyAlg );
|
||||
pNewAttrList->AddAttribute ( sKeySizeAttribute, sCdataAttribute, sStartKeySize );
|
||||
|
@@ -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 ) )
|
||||
, sFileEntryElement ( ELEMENT_FILE_ENTRY )
|
||||
, sManifestElement ( ELEMENT_MANIFEST )
|
||||
, sEncryptionDataElement( ELEMENT_ENCRYPTION_DATA )
|
||||
, sAlgorithmElement ( ELEMENT_ALGORITHM )
|
||||
, sStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION )
|
||||
, sKeyDerivationElement( 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 ) )
|
||||
, 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 ( 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" ) )
|
||||
, 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 ( RTL_CONSTASCII_USTRINGPARAM ( " " ) )
|
||||
, sWhiteSpace ( " " )
|
||||
|
||||
, sSHA256_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL ) )
|
||||
, sSHA1_Name ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_NAME ) )
|
||||
, sSHA1_URL ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_URL ) )
|
||||
, sSHA256_URL ( SHA256_URL )
|
||||
, sSHA1_Name ( SHA1_NAME )
|
||||
, sSHA1_URL ( 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 ) )
|
||||
, sSHA256_1k_URL ( SHA256_1K_URL )
|
||||
, sSHA1_1k_Name ( SHA1_1K_NAME )
|
||||
, sSHA1_1k_URL ( 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 ) )
|
||||
, sBlowfish_Name ( BLOWFISH_NAME )
|
||||
, sBlowfish_URL ( BLOWFISH_URL )
|
||||
, sAES128_URL ( AES128_URL )
|
||||
, sAES192_URL ( AES192_URL )
|
||||
, sAES256_URL ( AES256_URL )
|
||||
|
||||
, sPBKDF2_Name ( RTL_CONSTASCII_USTRINGPARAM ( PBKDF2_NAME ) )
|
||||
, sPBKDF2_URL ( RTL_CONSTASCII_USTRINGPARAM ( PBKDF2_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;
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -121,13 +121,13 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData
|
||||
::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_xStream.is() )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No stream!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
|
||||
throw uno::RuntimeException();
|
||||
}
|
||||
|
||||
@@ -144,13 +144,13 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a
|
||||
::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_xStream.is() )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No stream!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
|
||||
throw uno::RuntimeException();
|
||||
}
|
||||
|
||||
@@ -168,13 +168,13 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
|
||||
::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_xStream.is() )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No stream!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
|
||||
throw uno::RuntimeException();
|
||||
}
|
||||
|
||||
@@ -191,13 +191,13 @@ sal_Int32 SAL_CALL OInputCompStream::available( )
|
||||
::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_xStream.is() )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No stream!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "No stream!" );
|
||||
throw uno::RuntimeException();
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream()
|
||||
::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();
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream()
|
||||
::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();
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ void OInputCompStream::InternalDispose()
|
||||
::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();
|
||||
}
|
||||
|
||||
@@ -281,7 +281,7 @@ void SAL_CALL OInputCompStream::dispose( )
|
||||
::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();
|
||||
}
|
||||
|
||||
@@ -309,7 +309,7 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE
|
||||
::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();
|
||||
}
|
||||
|
||||
@@ -326,7 +326,7 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang:
|
||||
::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();
|
||||
}
|
||||
|
||||
@@ -343,7 +343,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -371,7 +371,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const ::rtl::OUString& sID )
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -421,7 +421,7 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -451,7 +451,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -486,7 +486,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -517,7 +517,7 @@ void SAL_CALL OInputCompStream::insertRelationshipByID( const ::rtl::OUString&
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -537,7 +537,7 @@ void SAL_CALL OInputCompStream::removeRelationshipByID( const ::rtl::OUString&
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -557,7 +557,7 @@ void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno::
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -576,7 +576,7 @@ void SAL_CALL OInputCompStream::clearRelationships()
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -594,7 +594,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -614,7 +614,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const ::rtl::OUString& aProper
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -641,13 +641,13 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
::rtl::OUString aPropertyName;
|
||||
if ( aProp == "IsEncrypted" )
|
||||
aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) );
|
||||
aPropertyName = "Encrypted";
|
||||
else
|
||||
aPropertyName = aProp;
|
||||
|
||||
@@ -679,7 +679,7 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener(
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -699,7 +699,7 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener(
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -719,7 +719,7 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener(
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
@@ -739,7 +739,7 @@ void SAL_CALL OInputCompStream::removeVetoableChangeListener(
|
||||
|
||||
if ( m_bDisposed )
|
||||
{
|
||||
::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
|
||||
::package::StaticAddLog( OSL_LOG_PREFIX "Disposed!" );
|
||||
throw lang::DisposedException();
|
||||
}
|
||||
|
||||
|
@@ -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 ) );
|
||||
}
|
||||
|
@@ -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();
|
||||
}
|
||||
|
||||
|
@@ -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" );
|
||||
|
Reference in New Issue
Block a user