summaryrefslogtreecommitdiff
path: root/svl/source/misc
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 10:43:06 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-06-02 12:58:04 -0500
commit69660f216aff43f397bbcc9d3c0f251078a6aa79 (patch)
treedea88c7e6ae808927ad9e4f8c4fa746dd2f58c7d /svl/source/misc
parent86013acb0fffb105d3fcd6ca331fae0d1ae02707 (diff)
targeted string re-work
Change-Id: I20062aa0d39c0675014f1d38f10d6ab5c331ec75
Diffstat (limited to 'svl/source/misc')
-rw-r--r--svl/source/misc/documentlockfile.cxx10
-rw-r--r--svl/source/misc/fstathelper.cxx2
-rw-r--r--svl/source/misc/sharecontrolfile.cxx8
3 files changed, 10 insertions, 10 deletions
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index e01dd09bb3c7..e5a5e106798f 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -62,7 +62,7 @@ sal_Bool DocumentLockFile::m_bAllowInteraction = sal_True;
// ----------------------------------------------------------------------
DocumentLockFile::DocumentLockFile( const ::rtl::OUString& aOrigURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".~lock." ) ) )
+: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( ".~lock." ) )
{
}
@@ -100,7 +100,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
try
{
uno::Reference< io::XStream > xTempFile(
- m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
+ m_xFactory->createInstance( ::rtl::OUString("com.sun.star.io.TempFile") ),
uno::UNO_QUERY_THROW );
uno::Reference< io::XSeekable > xSeekable( xTempFile, uno::UNO_QUERY_THROW );
@@ -124,11 +124,11 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
aInsertArg.ReplaceExisting = sal_False;
uno::Any aCmdArg;
aCmdArg <<= aInsertArg;
- aTargetContent.executeCommand( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), aCmdArg );
+ aTargetContent.executeCommand( ::rtl::OUString( "insert" ), aCmdArg );
// try to let the file be hidden if possible
try {
- aTargetContent.setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ), uno::makeAny( sal_True ) );
+ aTargetContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) );
} catch( uno::Exception& ) {}
}
catch( ucb::NameClashException& )
@@ -221,7 +221,7 @@ void DocumentLockFile::RemoveFile()
uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aCnt(m_aURL, xEnv);
- aCnt.executeCommand(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
+ aCnt.executeCommand(rtl::OUString("delete"),
uno::makeAny(sal_Bool(sal_True)));
}
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index bd504651e5db..95b3e976f1a2 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -47,7 +47,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL,
::ucbhelper::Content aTestContent( rURL,
uno::Reference< XCommandEnvironment > ());
uno::Any aAny = aTestContent.getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) );
+ OUString("DateModified") );
if( aAny.hasValue() )
{
bRet = sal_True;
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 9fa709ab4246..34d8b4a441b8 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -62,7 +62,7 @@ namespace svt {
// ----------------------------------------------------------------------
ShareControlFile::ShareControlFile( const ::rtl::OUString& aOrigURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".~sharing." ) ) )
+: LockFileCommon( aOrigURL, xFactory, ::rtl::OUString( ".~sharing." ) )
{
OpenStream();
@@ -115,11 +115,11 @@ void ShareControlFile::OpenStream()
ucb::InsertCommandArgument aInsertArg;
aInsertArg.Data = xInput;
aInsertArg.ReplaceExisting = sal_False;
- aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), uno::makeAny( aInsertArg ) );
+ aContent.executeCommand( rtl::OUString("insert"), uno::makeAny( aInsertArg ) );
// try to let the file be hidden if possible
try {
- aContent.setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ), uno::makeAny( sal_True ) );
+ aContent.setPropertyValue( ::rtl::OUString( "IsHidden" ), uno::makeAny( sal_True ) );
} catch( uno::Exception& ) {}
// Try to open one more time
@@ -362,7 +362,7 @@ void ShareControlFile::RemoveFile()
uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
- xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
+ xFactory->createInstance( ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess") ),
uno::UNO_QUERY_THROW );
xSimpleFileAccess->kill( m_aURL );
}