From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- package/source/manifest/ManifestExport.cxx | 26 +++--- package/source/manifest/ManifestImport.cxx | 31 ++++--- package/source/manifest/ManifestImport.hxx | 132 ++++++++++++++--------------- package/source/manifest/ManifestReader.cxx | 1 - package/source/manifest/ManifestReader.hxx | 12 +-- package/source/manifest/ManifestWriter.hxx | 12 +-- package/source/manifest/UnoRegister.cxx | 1 - 7 files changed, 105 insertions(+), 110 deletions(-) (limited to 'package/source/manifest') diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 51afa9332d7b..1ecb093c3e2b 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -36,8 +36,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHandler, const uno::Sequence< uno::Sequence < beans::PropertyValue > >& rManList ) { @@ -94,13 +92,13 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa const sal_uInt32 nManLength = rManList.getLength(); // find the mediatype of the document if any - ::rtl::OUString aDocMediaType; - ::rtl::OUString aDocVersion; + OUString aDocMediaType; + OUString aDocVersion; for (sal_uInt32 nInd = 0; nInd < nManLength ; nInd++ ) { - ::rtl::OUString aMediaType; - ::rtl::OUString aPath; - ::rtl::OUString aVersion; + OUString aMediaType; + OUString aPath; + OUString aVersion; const beans::PropertyValue *pValue = pSequence[nInd].getConstArray(); for (sal_uInt32 j = 0, nNum = pSequence[nInd].getLength(); j < nNum; j++, pValue++) @@ -192,7 +190,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa { ::comphelper::AttributeList *pAttrList = new ::comphelper::AttributeList; const beans::PropertyValue *pValue = pSequence[i].getConstArray(); - ::rtl::OUString aString; + OUString aString; const uno::Any *pVector = NULL, *pSalt = NULL, *pIterationCount = NULL, *pDigest = NULL, *pDigestAlg = NULL, *pEncryptAlg = NULL, *pStartKeyAlg = NULL, *pDerivedKeySize = NULL; for (sal_uInt32 j = 0, nNum = pSequence[i].getLength(); j < nNum; j++, pValue++) { @@ -217,7 +215,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa { sal_Int64 nSize = 0; pValue->Value >>= nSize; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append ( nSize ); pAttrList->AddAttribute ( sSizeAttribute, sCdataAttribute, aBuffer.makeStringAndClear() ); } @@ -247,13 +245,13 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa // ==== Encryption Data ::comphelper::AttributeList * pNewAttrList = new ::comphelper::AttributeList; uno::Reference < xml::sax::XAttributeList > xNewAttrList (pNewAttrList); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; uno::Sequence < sal_Int8 > aSequence; xHandler->ignorableWhitespace ( sWhiteSpace ); // ==== Digest - ::rtl::OUString sChecksumType; + OUString sChecksumType; sal_Int32 nDigestAlgID = 0; *pDigestAlg >>= nDigestAlgID; if ( nDigestAlgID == xml::crypto::DigestID::SHA256_1K ) @@ -279,7 +277,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa *pEncryptAlg >>= nEncAlgID; *pDerivedKeySize >>= nDerivedKeySize; - ::rtl::OUString sEncAlgName; + OUString sEncAlgName; if ( nEncAlgID == xml::crypto::CipherID::AES_CBC_W3C_PADDING ) { OSL_ENSURE( nDerivedKeySize, "Unexpected key size is provided!" ); @@ -340,8 +338,8 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa pNewAttrList = new ::comphelper::AttributeList; xNewAttrList = pNewAttrList; - ::rtl::OUString sStartKeyAlg; - ::rtl::OUString sStartKeySize; + OUString sStartKeyAlg; + OUString sStartKeySize; sal_Int32 nStartKeyAlgID = 0; *pStartKeyAlg >>= nStartKeyAlgID; if ( nStartKeyAlgID == xml::crypto::DigestID::SHA256 ) diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 0fe547569eed..970417a06476 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star; using namespace std; -using ::rtl::OUString; // --------------------------------------------------- ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector ) @@ -279,7 +278,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re throw( xml::sax::SAXException, uno::RuntimeException ) { StringHashMap aConvertedAttribs; - ::rtl::OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs ); + OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs ); size_t nLevel = aStack.size(); @@ -349,7 +348,7 @@ namespace void SAL_CALL ManifestImport::endElement( const OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { - ::rtl::OUString aConvertedName = ConvertName( aName ); + OUString aConvertedName = ConvertName( aName ); if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) { if ( aConvertedName.equals( sFileEntryElement ) && aStack.back().m_bValid ) @@ -393,10 +392,10 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax } // --------------------------------------------------- -::rtl::OUString ManifestImport::PushNameAndNamespaces( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs ) +OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs ) { StringHashMap aNamespaces; - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > aAttribsStrs; + ::std::vector< ::std::pair< OUString, OUString > > aAttribsStrs; if ( xAttribs.is() ) { @@ -405,25 +404,25 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax for( sal_Int16 nInd = 0; nInd < nAttrCount; nInd++ ) { - ::rtl::OUString aAttrName = xAttribs->getNameByIndex( nInd ); - ::rtl::OUString aAttrValue = xAttribs->getValueByIndex( nInd ); + OUString aAttrName = xAttribs->getNameByIndex( nInd ); + OUString aAttrValue = xAttribs->getValueByIndex( nInd ); if ( aAttrName.getLength() >= 5 && aAttrName.startsWith("xmlns") && ( aAttrName.getLength() == 5 || aAttrName.getStr()[5] == ( sal_Unicode )':' ) ) { // this is a namespace declaration - ::rtl::OUString aNsName( ( aAttrName.getLength() == 5 ) ? ::rtl::OUString() : aAttrName.copy( 6 ) ); + OUString aNsName( ( aAttrName.getLength() == 5 ) ? OUString() : aAttrName.copy( 6 ) ); aNamespaces[aNsName] = aAttrValue; } else { // this is no namespace declaration - aAttribsStrs.push_back( pair< ::rtl::OUString, ::rtl::OUString >( aAttrName, aAttrValue ) ); + aAttribsStrs.push_back( pair< OUString, OUString >( aAttrName, aAttrValue ) ); } } } - ::rtl::OUString aConvertedName = ConvertNameWithNamespace( aName, aNamespaces ); + OUString aConvertedName = ConvertNameWithNamespace( aName, aNamespaces ); if ( !aConvertedName.getLength() ) aConvertedName = ConvertName( aName ); @@ -439,10 +438,10 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax } // --------------------------------------------------- -::rtl::OUString ManifestImport::ConvertNameWithNamespace( const ::rtl::OUString& aName, const StringHashMap& aNamespaces ) +OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces ) { - ::rtl::OUString aNsAlias; - ::rtl::OUString aPureName = aName; + OUString aNsAlias; + OUString aPureName = aName; sal_Int32 nInd = aName.indexOf( ( sal_Unicode )':' ); if ( nInd != -1 && nInd < aName.getLength() ) @@ -451,7 +450,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax aPureName = aName.copy( nInd + 1 ); } - ::rtl::OUString aResult; + OUString aResult; StringHashMap::const_iterator aIter = aNamespaces.find( aNsAlias ); if ( aIter != aNamespaces.end() @@ -466,9 +465,9 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax } // --------------------------------------------------- -::rtl::OUString ManifestImport::ConvertName( const ::rtl::OUString& aName ) +OUString ManifestImport::ConvertName( const OUString& aName ) { - ::rtl::OUString aConvertedName; + OUString aConvertedName; for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter ) { if ( !aIter->m_aNamespaces.empty() ) diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 51c5244f0697..73a1b58d52cd 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -32,15 +32,15 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; +typedef ::boost::unordered_map< OUString, OUString, OUStringHash, eqFunc > StringHashMap; struct ManifestScopeEntry { - ::rtl::OUString m_aConvertedName; + OUString m_aConvertedName; StringHashMap m_aNamespaces; bool m_bValid; - ManifestScopeEntry( const ::rtl::OUString& aConvertedName, const StringHashMap& aNamespaces ) + ManifestScopeEntry( const OUString& aConvertedName, const StringHashMap& aNamespaces ) : m_aConvertedName( aConvertedName ) , m_aNamespaces( aNamespaces ) , m_bValid( true ) @@ -61,66 +61,66 @@ protected: sal_Int32 nDerivedKeySize; ::std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rManVector; - const ::rtl::OUString sFileEntryElement; - const ::rtl::OUString sManifestElement; - const ::rtl::OUString sEncryptionDataElement; - const ::rtl::OUString sAlgorithmElement; - const ::rtl::OUString sStartKeyAlgElement; - const ::rtl::OUString sKeyDerivationElement; - - const ::rtl::OUString sCdataAttribute; - const ::rtl::OUString sMediaTypeAttribute; - const ::rtl::OUString sVersionAttribute; - const ::rtl::OUString sFullPathAttribute; - const ::rtl::OUString sSizeAttribute; - const ::rtl::OUString sSaltAttribute; - const ::rtl::OUString sInitialisationVectorAttribute; - const ::rtl::OUString sIterationCountAttribute; - const ::rtl::OUString sKeySizeAttribute; - const ::rtl::OUString sAlgorithmNameAttribute; - const ::rtl::OUString sStartKeyAlgNameAttribute; - const ::rtl::OUString sKeyDerivationNameAttribute; - const ::rtl::OUString sChecksumAttribute; - const ::rtl::OUString sChecksumTypeAttribute; - - const ::rtl::OUString sFullPathProperty; - const ::rtl::OUString sMediaTypeProperty; - const ::rtl::OUString sVersionProperty; - const ::rtl::OUString sIterationCountProperty; - const ::rtl::OUString sDerivedKeySizeProperty; - const ::rtl::OUString sSaltProperty; - const ::rtl::OUString sInitialisationVectorProperty; - const ::rtl::OUString sSizeProperty; - const ::rtl::OUString sDigestProperty; - const ::rtl::OUString sEncryptionAlgProperty; - const ::rtl::OUString sStartKeyAlgProperty; - const ::rtl::OUString sDigestAlgProperty; - - const ::rtl::OUString sWhiteSpace; - - const ::rtl::OUString sSHA256_URL; - const ::rtl::OUString sSHA1_Name; - const ::rtl::OUString sSHA1_URL; - - const ::rtl::OUString sSHA256_1k_URL; - const ::rtl::OUString sSHA1_1k_Name; - const ::rtl::OUString sSHA1_1k_URL; - - const ::rtl::OUString sBlowfish_Name; - const ::rtl::OUString sBlowfish_URL; - const ::rtl::OUString sAES128_URL; - const ::rtl::OUString sAES192_URL; - const ::rtl::OUString sAES256_URL; - - const ::rtl::OUString sPBKDF2_Name; - const ::rtl::OUString sPBKDF2_URL; - - - ::rtl::OUString PushNameAndNamespaces( const ::rtl::OUString& aName, + const OUString sFileEntryElement; + const OUString sManifestElement; + const OUString sEncryptionDataElement; + const OUString sAlgorithmElement; + const OUString sStartKeyAlgElement; + const OUString sKeyDerivationElement; + + const OUString sCdataAttribute; + const OUString sMediaTypeAttribute; + const OUString sVersionAttribute; + const OUString sFullPathAttribute; + const OUString sSizeAttribute; + const OUString sSaltAttribute; + const OUString sInitialisationVectorAttribute; + const OUString sIterationCountAttribute; + const OUString sKeySizeAttribute; + const OUString sAlgorithmNameAttribute; + const OUString sStartKeyAlgNameAttribute; + const OUString sKeyDerivationNameAttribute; + const OUString sChecksumAttribute; + const OUString sChecksumTypeAttribute; + + const OUString sFullPathProperty; + const OUString sMediaTypeProperty; + const OUString sVersionProperty; + const OUString sIterationCountProperty; + const OUString sDerivedKeySizeProperty; + const OUString sSaltProperty; + const OUString sInitialisationVectorProperty; + const OUString sSizeProperty; + const OUString sDigestProperty; + const OUString sEncryptionAlgProperty; + const OUString sStartKeyAlgProperty; + const OUString sDigestAlgProperty; + + const OUString sWhiteSpace; + + const OUString sSHA256_URL; + const OUString sSHA1_Name; + const OUString sSHA1_URL; + + const OUString sSHA256_1k_URL; + const OUString sSHA1_1k_Name; + const OUString sSHA1_1k_URL; + + const OUString sBlowfish_Name; + const OUString sBlowfish_URL; + const OUString sAES128_URL; + const OUString sAES192_URL; + const OUString sAES256_URL; + + const OUString sPBKDF2_Name; + const OUString sPBKDF2_URL; + + + OUString PushNameAndNamespaces( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs ); - ::rtl::OUString ConvertNameWithNamespace( const ::rtl::OUString& aName, const StringHashMap& aNamespaces ); - ::rtl::OUString ConvertName( const ::rtl::OUString& aName ); + OUString ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces ); + OUString ConvertName( const OUString& aName ); public: ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector ); @@ -129,15 +129,15 @@ public: throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index feac40c72f8b..2e2b6a0922c0 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -37,7 +37,6 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::packages::manifest; -using ::rtl::OUString; ManifestReader::ManifestReader( const Reference < XComponentContext > & xContext ) : m_xContext ( xContext ) diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index d422f9a7c29e..d050405ace15 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -46,17 +46,17 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // Component constructor - static ::rtl::OUString static_getImplementationName(); - static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames(); - sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName); + static OUString static_getImplementationName(); + static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames(); + sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName); static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory ); }; #endif diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index 8453d928cfc6..4b7e773c729b 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -46,18 +46,18 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // Component constructor - static ::rtl::OUString static_getImplementationName(); - static ::com::sun::star::uno::Sequence < ::rtl::OUString > static_getSupportedServiceNames(); + static OUString static_getImplementationName(); + static ::com::sun::star::uno::Sequence < OUString > static_getSupportedServiceNames(); static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory ); - sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName); + sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName); }; #endif diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 47f38270513d..e8078634b195 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::packages::manifest; -using rtl::OUString; /** * This function is called to get service factories for an implementation. -- cgit