From 8b27d78b4afaa9c47ca0fda144c8060f2f14046b Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 19 Mar 2013 09:22:44 +0100 Subject: automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- helpcompiler/source/HelpIndexer.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'helpcompiler/source/HelpIndexer.cxx') diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx index 05db910f7e17..06e542a57c61 100644 --- a/helpcompiler/source/HelpIndexer.cxx +++ b/helpcompiler/source/HelpIndexer.cxx @@ -47,8 +47,8 @@ HelpIndexer::HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module, { d_indexDir = rtl::OUStringBuffer(outDir).append('/'). append(module).appendAscii(RTL_CONSTASCII_STRINGPARAM(".idxl")).toString(); - d_captionDir = srcDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/caption")); - d_contentDir = srcDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/content")); + d_captionDir = srcDir + rtl::OUString("/caption"); + d_contentDir = srcDir + rtl::OUString("/content"); } bool HelpIndexer::indexDocuments() @@ -117,7 +117,7 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) { osl::Directory dir(path); if (osl::FileBase::E_None != dir.open()) { - d_error = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error reading directory ")) + path; + d_error = rtl::OUString("Error reading directory ") + path; return true; } @@ -136,8 +136,8 @@ bool HelpIndexer::scanForFiles(rtl::OUString const & path) { bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) { // Add the help path as an indexed, untokenized field. - rtl::OUString path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#HLP#")) + - d_module + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + fileName; + rtl::OUString path = rtl::OUString("#HLP#") + + d_module + rtl::OUString("/") + fileName; std::vector aPath(OUStringToTCHARVec(path)); doc->add(*_CLNEW Field(_T("path"), &aPath[0], Field::STORE_YES | Field::INDEX_UNTOKENIZED)); @@ -146,11 +146,11 @@ bool HelpIndexer::helpDocument(rtl::OUString const & fileName, Document *doc) { rtl_UriCharClassUric, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); // Add the caption as a field. - rtl::OUString captionPath = d_captionDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEscapedFileName; + rtl::OUString captionPath = d_captionDir + rtl::OUString("/") + sEscapedFileName; doc->add(*_CLNEW Field(_T("caption"), helpFileReader(captionPath), Field::STORE_NO | Field::INDEX_TOKENIZED)); // Add the content as a field. - rtl::OUString contentPath = d_contentDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEscapedFileName; + rtl::OUString contentPath = d_contentDir + rtl::OUString("/") + sEscapedFileName; doc->add(*_CLNEW Field(_T("content"), helpFileReader(contentPath), Field::STORE_NO | Field::INDEX_TOKENIZED)); return true; -- cgit v1.2.3