diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-16 15:06:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-17 07:28:49 +0200 |
commit | 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 (patch) | |
tree | d3ec594b343f56c76056418d835d3bc7b696a9ab /sw/source/uibase/misc | |
parent | f51cd77bcecc5134e0e04c398bfb7b34eb65d68d (diff) |
Rename OUStringLiteral1 to OUStringChar
It started out as a wrapper around character literals, but has by now become a
wrapper around arbitrary single characters. Besides updating the documentation,
this change is a mechanical
for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done
Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f
Reviewed-on: https://gerrit.libreoffice.org/80892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/uibase/misc')
-rw-r--r-- | sw/source/uibase/misc/glosdoc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index d64a39456d45..69a2df2237cc 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -181,7 +181,7 @@ bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) return false; const OUString sNewFilePath(m_PathArr[nNewPath]); const OUString sNewGroup = lcl_CheckFileName(sNewFilePath, rGroupName.getToken(0, GLOS_DELIM)) - + OUStringLiteral1(GLOS_DELIM) + sNewPath; + + OUStringChar(GLOS_DELIM) + sNewPath; std::unique_ptr<SwTextBlocks> pBlock = GetGlosDoc( sNewGroup ); if(pBlock) { @@ -228,7 +228,7 @@ bool SwGlossaries::RenameGroupDoc( RemoveFileFromList( rOldGroup ); - rNewGroup = sNewFileName + OUStringLiteral1(GLOS_DELIM) + OUString::number(nNewPath); + rNewGroup = sNewFileName + OUStringChar(GLOS_DELIM) + OUString::number(nNewPath); if (m_GlosArr.empty()) { GetNameList(); @@ -252,7 +252,7 @@ bool SwGlossaries::DelGroupDoc(const OUString &rName) return false; const OUString sBaseName(rName.getToken(0, GLOS_DELIM)); const OUString sFileURL = lcl_FullPathName(m_PathArr[nPath], sBaseName); - const OUString aName = sBaseName + OUStringLiteral1(GLOS_DELIM) + OUString::number(nPath); + const OUString aName = sBaseName + OUStringChar(GLOS_DELIM) + OUString::number(nPath); // Even if the file doesn't exist it has to be deleted from // the list of text block regions // no && because of CFfront @@ -313,14 +313,14 @@ std::vector<OUString> & SwGlossaries::GetNameList() for (const OUString& aTitle : aFiles) { const OUString sName( aTitle.copy( 0, aTitle.getLength() - sExt.getLength() ) - + OUStringLiteral1(GLOS_DELIM) + OUString::number( static_cast<sal_Int16>(i) )); + + OUStringChar(GLOS_DELIM) + OUString::number( static_cast<sal_Int16>(i) )); m_GlosArr.push_back(sName); } } if (m_GlosArr.empty()) { // the standard block is inside of the path's first part - m_GlosArr.emplace_back(SwGlossaries::GetDefName() + OUStringLiteral1(GLOS_DELIM) + "0" ); + m_GlosArr.emplace_back(SwGlossaries::GetDefName() + OUStringChar(GLOS_DELIM) + "0" ); } } return m_GlosArr; |