diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 17:24:31 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 17:57:17 -0500 |
commit | 056f1611060ed14f31f5c88c6db752bac2358c86 (patch) | |
tree | 0465ca9cdd09e665dc7364f5e06b9964cc156999 /svx/source/gallery2 | |
parent | targeted string re-work (diff) | |
download | core-056f1611060ed14f31f5c88c6db752bac2358c86.tar.gz core-056f1611060ed14f31f5c88c6db752bac2358c86.zip |
targeted string re-work
Change-Id: I8256b300bd50e0aed8bee364ebe518087969d184
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 12 | ||||
-rw-r--r-- | svx/source/gallery2/galmisc.cxx | 12 | ||||
-rw-r--r-- | svx/source/gallery2/galtheme.cxx | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index a9d3ad62f713..b00d02ab6f97 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -63,7 +63,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin { INetURLObject aURL( rBaseURL ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - String aFileName( String( RTL_CONSTASCII_USTRINGPARAM( "sg" ) ) ); + String aFileName( String( "sg" ) ); aURL.Append( ( aFileName += String::CreateFromInt32( nFileNumber ) ) += String( RTL_CONSTASCII_USTRINGPARAM( ".thm" ) ) ); aThmURL = ImplGetURLIgnoreCase( aURL ); @@ -270,7 +270,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR ::ucbhelper::Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); uno::Sequence< OUString > aProps( 1 ); - aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url")); + aProps.getArray()[ 0 ] = OUString("Url"); uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); @@ -312,10 +312,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( xContentAccess.is() ) { - static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")); - static const ::rtl::OUString s_sIsReadOnly(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")); - static const ::rtl::OUString s_sSDG_EXT(RTL_CONSTASCII_USTRINGPARAM("sdg")); - static const ::rtl::OUString s_sSDV_EXT(RTL_CONSTASCII_USTRINGPARAM("sdv")); + static const ::rtl::OUString s_sTitle("Title"); + static const ::rtl::OUString s_sIsReadOnly("IsReadOnly"); + static const ::rtl::OUString s_sSDG_EXT("sdg"); + static const ::rtl::OUString s_sSDV_EXT("sdv"); while( xResultSet->next() ) { diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 5927b43746ab..00ee9b709f19 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -283,7 +283,7 @@ sal_Bool FileExists( const INetURLObject& rURL ) ::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); OUString aTitle; - aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle; + aCnt.getPropertyValue( OUString("Title") ) >>= aTitle; bRet = ( !aTitle.isEmpty() ); } catch( const ucb::ContentCreationException& ) @@ -317,11 +317,11 @@ sal_Bool CreateDir( const INetURLObject& rURL ) uno::Sequence< OUString > aProps( 1 ); uno::Sequence< uno::Any > aValues( 1 ); - aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); + aProps.getArray()[ 0 ] = OUString("Title"); aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) ); ::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv ); - bRet = aParent.insertNewContent( OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")), aProps, aValues, aContent ); + bRet = aParent.insertNewContent( OUString("application/vnd.sun.staroffice.fsys-folder"), aProps, aValues, aContent ); } catch( const ucb::ContentCreationException& ) { @@ -347,7 +347,7 @@ sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) { ::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); - aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), + aDestPath.executeCommand( OUString("transfer"), uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ), rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) ); bRet = sal_True; @@ -376,7 +376,7 @@ sal_Bool KillFile( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); - aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), uno::makeAny( sal_Bool( sal_True ) ) ); } catch( const ucb::ContentCreationException& ) { @@ -407,7 +407,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) : if( xMgr.is() ) { uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.XProgressMonitor")) ), + ::rtl::OUString("com.sun.star.awt.XProgressMonitor") ), uno::UNO_QUERY ); if ( xMonitor.is() ) diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index d0e2ac8091dd..27caa5f5ef1d 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1183,12 +1183,12 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s ::ucbhelper::Content aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() ); sal_Bool bFolder = false; - aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder; + aCnt.getPropertyValue( OUString("IsFolder") ) >>= bFolder; if( bFolder ) { uno::Sequence< OUString > aProps( 1 ); - aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url")); + aProps.getArray()[ 0 ] = OUString("Url"); uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY ); if( xContentAccess.is() ) |