From 31cc01a5ffe32c1c7b8226d09d799ea83f6a8d30 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 31 May 2012 21:35:45 -0500 Subject: targeted string re-work Change-Id: Ifd6b90778725d94a9338a53a4cdc514cdb595052 --- sot/source/sdstor/stgelem.cxx | 8 +++--- sot/source/sdstor/storage.cxx | 8 +++--- sot/source/sdstor/ucbstorage.cxx | 54 ++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 35 deletions(-) (limited to 'sot/source/sdstor') diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index c51dc1be6339..e8eb0e59db45 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -235,11 +235,11 @@ static String ToUpperUnicode( const String & rStr ) // I don't know the locale, so en_US is hopefully fine /* com.sun.star.lang.Locale aLocale; - aLocale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("en")); - aLocale.Country = OUString(RTL_CONSTASCII_USTRINGPARAM("US")); + aLocale.Language = OUString("en"); + aLocale.Country = OUString("US"); */ - static rtl::OUString aEN(RTL_CONSTASCII_USTRINGPARAM("en")); - static rtl::OUString aUS(RTL_CONSTASCII_USTRINGPARAM("US")); + static rtl::OUString aEN("en"); + static rtl::OUString aUS("US"); static CharClass aCC( com::sun::star::lang::Locale( aEN, aUS, rtl::OUString() ) ); return aCC.uppercase( rStr ); } diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index c4120bd488de..5c7241a44177 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -1217,7 +1217,7 @@ void SotStorage::SetKey( const rtl::OString& rKey ) ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 ); ::com::sun::star::uno::Any aAny; aAny <<= aSequ; - SetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey")), aAny ); + SetProperty( ::rtl::OUString("EncryptionKey"), aAny ); } } } @@ -1243,8 +1243,8 @@ SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < c { uno::Reference < beans::XPropertySet > xStreamProps( xStream, uno::UNO_QUERY_THROW ); xStreamProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), - uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ) ) ); + ::rtl::OUString( "MediaType" ), + uno::makeAny( ::rtl::OUString( "application/vnd.sun.star.oleobject" ) ) ); } pStream = utl::UcbStreamHelper::CreateStream( xStream ); @@ -1266,7 +1266,7 @@ sal_Int32 SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::s return 0; ::rtl::OUString aMediaType; - xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= aMediaType; + xProps->getPropertyValue( ::rtl::OUString("MediaType") ) >>= aMediaType; if ( !aMediaType.isEmpty() ) { ::com::sun::star::datatransfer::DataFlavor aDataFlavor; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index fd5761a2f384..7fdd53589998 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -670,7 +670,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM { xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xProgress ); - aTemp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?repairpackage")); + aTemp += rtl::OUString("?repairpackage"); } m_pContent = new ::ucbhelper::Content( aTemp, xComEnv ); @@ -688,7 +688,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 ); ::com::sun::star::uno::Any aAny; aAny <<= aSequ; - m_pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey")), aAny ); + m_pContent->setPropertyValue( ::rtl::OUString("EncryptionKey"), aAny ); } } } @@ -1177,7 +1177,7 @@ sal_Int16 UCBStorageStream_Impl::Commit() aArg.Data = xStream; aArg.ReplaceExisting = sal_True; aAny <<= aArg; - m_pContent->executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), aAny ); + m_pContent->executeCommand( ::rtl::OUString("insert"), aAny ); // wrapper now controls lifetime of temporary file m_aTempURL.Erase(); @@ -1782,7 +1782,7 @@ void UCBStorage_Impl::Init() { // Hack! Avoid access to the manifest file until mediatype is not available in the first segment of a // disk spanned file - m_aContentType = m_aOriginalContentType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.impress") ); + m_aContentType = m_aOriginalContentType = ::rtl::OUString( "application/vnd.sun.xml.impress" ); } else if ( m_pContent ) { @@ -1794,8 +1794,8 @@ void UCBStorage_Impl::Init() if ( m_nError == ERRCODE_NONE ) { // read the manifest.xml file - aObj.Append( String( RTL_CONSTASCII_USTRINGPARAM("META-INF") ) ); - aObj.Append( String( RTL_CONSTASCII_USTRINGPARAM("manifest.xml") ) ); + aObj.Append( String( "META-INF" ) ); + aObj.Append( String( "manifest.xml" ) ); // create input stream SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ ); @@ -1811,7 +1811,7 @@ void UCBStorage_Impl::Init() Reference < ::com::sun::star::packages::manifest::XManifestReader > xReader = Reference< ::com::sun::star::packages::manifest::XManifestReader > ( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.manifest.ManifestReader"))), UNO_QUERY) ; + ::rtl::OUString("com.sun.star.packages.manifest.ManifestReader")), UNO_QUERY) ; Sequence < Sequence < PropertyValue > > aProps = xReader->readManifestSequence( xInputStream ); // cleanup @@ -1831,7 +1831,7 @@ void UCBStorage_Impl::Init() { // get the manifest information from the package try { - Any aAny = m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ); + Any aAny = m_pContent->getPropertyValue( ::rtl::OUString("MediaType") ); rtl::OUString aTmp; if ( ( aAny >>= aTmp ) && !aTmp.isEmpty() ) m_aContentType = m_aOriginalContentType = aTmp; @@ -1876,7 +1876,7 @@ void UCBStorage_Impl::CreateContent() { xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), m_xProgressHandler ); - aTemp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?repairpackage")); + aTemp += rtl::OUString("?repairpackage"); } m_pContent = new ::ucbhelper::Content( aTemp, xComEnv ); @@ -1903,10 +1903,10 @@ void UCBStorage_Impl::ReadContent() // create cursor for access to children Sequence< ::rtl::OUString > aProps(4); ::rtl::OUString* pProps = aProps.getArray(); - pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); - pProps[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")); - pProps[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); - pProps[3] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")); + pProps[0] = ::rtl::OUString("Title"); + pProps[1] = ::rtl::OUString("IsFolder"); + pProps[2] = ::rtl::OUString("MediaType"); + pProps[3] = ::rtl::OUString("Size"); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; try @@ -1961,13 +1961,13 @@ void UCBStorage_Impl::ReadContent() { xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), m_xProgressHandler ); - aName += String( RTL_CONSTASCII_USTRINGPARAM( "?repairpackage" ) ); + aName += String( "?repairpackage" ); } ::ucbhelper::Content aContent( aName, xComEnv ); ::rtl::OUString aMediaType; - Any aAny = aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ); + Any aAny = aContent.getPropertyValue( ::rtl::OUString("MediaType") ); if ( ( aAny >>= aMediaType ) && ( aMediaType.compareToAscii("application/vnd.sun.star.oleobject") == 0 ) ) pElement->m_bIsStorage = sal_True; else if ( aMediaType.isEmpty() ) @@ -2127,9 +2127,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert if ( !m_bIsRoot ) aPath += m_aName; aPath += '/'; - aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + aProps[0].Name = ::rtl::OUString("MediaType"); aProps[0].Value <<= (::rtl::OUString ) m_aContentType; - aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullPath")); + aProps[1].Name = ::rtl::OUString("FullPath"); aProps[1].Value <<= (::rtl::OUString ) aPath; rSequence[ nProps++ ] = aProps; @@ -2150,9 +2150,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert // properties of streams String aElementPath( aPath ); aElementPath += pElement->m_aName; - aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + aProps[0].Name = ::rtl::OUString("MediaType"); aProps[0].Value <<= (::rtl::OUString ) pElement->GetContentType(); - aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullPath")); + aProps[1].Name = ::rtl::OUString("FullPath"); aProps[1].Value <<= (::rtl::OUString ) aElementPath; rSequence[ nProps++ ] = aProps; } @@ -2199,7 +2199,7 @@ sal_Bool UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent ) Sequence < ::rtl::OUString > aNames(1); ::rtl::OUString* pNames = aNames.getArray(); - pNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ); + pNames[0] = ::rtl::OUString( "Title" ); Sequence < Any > aValues(1); Any* pValues = aValues.getArray(); pValues[0] = makeAny( ::rtl::OUString( m_aName ) ); @@ -2269,7 +2269,7 @@ sal_Int16 UCBStorage_Impl::Commit() // first remove all open stream handles if( !pElement->m_xStream.Is() || pElement->m_xStream->Clear() ) { - pContent->executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); + pContent->executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); nRet = COMMIT_RESULT_SUCCESS; } else @@ -2315,7 +2315,7 @@ sal_Int16 UCBStorage_Impl::Commit() nLocalRet = COMMIT_RESULT_SUCCESS; Any aAny; aAny <<= (rtl::OUString) pElement->m_aName; - pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aAny ); + pContent->setPropertyValue( ::rtl::OUString("Title"), aAny ); } if ( pElement->IsLoaded() && pElement->GetContentType() != pElement->GetOriginalContentType() ) @@ -2324,7 +2324,7 @@ sal_Int16 UCBStorage_Impl::Commit() nLocalRet = COMMIT_RESULT_SUCCESS; Any aAny; aAny <<= (rtl::OUString) pElement->GetContentType(); - pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aAny ); + pContent->setPropertyValue( ::rtl::OUString("MediaType"), aAny ); } if ( nLocalRet != COMMIT_RESULT_NOTHING_TO_DO ) @@ -2375,7 +2375,7 @@ sal_Int16 UCBStorage_Impl::Commit() // clipboard format and ClassId will be retrieved from the media type when the file is loaded again Any aType; aType <<= (rtl::OUString) m_aContentType; - m_pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aType ); + m_pContent->setPropertyValue( ::rtl::OUString("MediaType"), aType ); if ( m_bIsLinked ) { @@ -2398,7 +2398,7 @@ sal_Int16 UCBStorage_Impl::Commit() Reference < ::com::sun::star::packages::manifest::XManifestWriter > xWriter = Reference< ::com::sun::star::packages::manifest::XManifestWriter > ( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.manifest.ManifestWriter"))), UNO_QUERY) ; + ::rtl::OUString("com.sun.star.packages.manifest.ManifestWriter")), UNO_QUERY) ; sal_Int32 nCount = GetObjectCount() + 1; Sequence < Sequence < PropertyValue > > aProps( nCount ); sal_Int32 nProps = 0; @@ -2410,7 +2410,7 @@ sal_Int16 UCBStorage_Impl::Commit() xWriter = NULL; xOutputStream = NULL; DELETEZ( pTempFile ); - aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("manifest.xml")), NameClash::OVERWRITE ); + aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, ::rtl::OUString("manifest.xml"), NameClash::OVERWRITE ); } } else @@ -2421,7 +2421,7 @@ sal_Int16 UCBStorage_Impl::Commit() #endif // force writing Any aAny; - m_pContent->executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flush")), aAny ); + m_pContent->executeCommand( ::rtl::OUString("flush"), aAny ); if ( m_pSource != 0 ) { SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READ ); -- cgit v1.2.3