diff options
Diffstat (limited to 'extensions/source/oooimprovement/logstorage.cxx')
-rw-r--r-- | extensions/source/oooimprovement/logstorage.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx index 7181ed2fdce6..7bf3ef10ff10 100644 --- a/extensions/source/oooimprovement/logstorage.cxx +++ b/extensions/source/oooimprovement/logstorage.cxx @@ -47,7 +47,7 @@ namespace { using namespace oooimprovement; - static const OUString CSSU_PATHSUB = OUString::createFromAscii("com.sun.star.util.PathSubstitution"); + static const OUString CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution")); static OUString getLogPathFromCfg(const Reference<XMultiServiceFactory>& sf) { @@ -63,14 +63,14 @@ namespace static bool isZipfile(const OUString& fileurl) { - static const OUString file_extension = OUString::createFromAscii(".zip"); + static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".zip")); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()); }; static bool isLogfile(const OUString& fileurl) { - static const OUString file_extension = OUString::createFromAscii(".csv"); - static const OUString current = OUString::createFromAscii("Current.csv"); + static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".csv")); + static const OUString current(RTL_CONSTASCII_USTRINGPARAM("Current.csv")); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()) && !fileurl.match(current, fileurl.getLength()-current.getLength()); @@ -84,7 +84,7 @@ namespace static Sequence<OUString> getAllLogStoragefiles(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); return file_access->getFolderContents( getLogPathFromCfg(sf), @@ -107,7 +107,7 @@ namespace static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); OUString log_path(getLogPathFromCfg(sf)); if(!file_access->isFolder(log_path)) @@ -130,7 +130,7 @@ namespace oooimprovement void LogStorage::clear() { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); vector<OUString> files_to_kill = getLogStoragefiles(m_ServiceFactory, &isZipOrLogFile); for(vector<OUString>::iterator item = files_to_kill.begin(); |